FCL/sf/mw/qt: comparison src/testlib/qtestcase.cpp

equal deleted inserted replaced

-:b72c6db6890b
+:5dc02b23752f
 static int keyDelay = -1;
 static int mouseDelay = -1;
 static int eventDelay = -1;
 static int keyVerbose = -1;
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+static bool noCrashHandler = false;
+#endif
 void filter_unprintable(char *str)
 {
 char *idx = str;
 while (*idx) {
 str[size - 1] = '\0';
 filter_unprintable(str);
 return res;
+}
+/*! \internal
+Invoke a method of the object without generating warning if the method does not exist
+*/
+static void invokeMethod(QObject *obj, const char *methodName)
+{
+const QMetaObject *metaObject = obj->metaObject();
+int funcIndex = metaObject->indexOfMethod(methodName);
+if (funcIndex >= 0) {
+QMetaMethod method = metaObject->method(funcIndex);
+method.invoke(obj, Qt::DirectConnection);
+}
 }
 bool Q_TESTLIB_EXPORT defaultKeyVerbose()
 {
 if (keyVerbose == -1) {
 " -keydelay ms      : Set default delay for keyboard simulation to ms milliseconds\n"
 " -mousedelay ms    : Set default delay for mouse simulation to ms milliseconds\n"
 " -keyevent-verbose : Turn on verbose messages for keyboard simulation\n"
 " -maxwarnings n    : Sets the maximum amount of messages to output.\n"
 "                     0 means unlimited, default: 2000\n"
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+" -nocrashhandler   : Disables the crash handler\n"
+#endif
 "\n"
 " Benchmark related options:\n"
 #ifdef QTESTLIB_USE_VALGRIND
 " -callgrind      : Use callgrind to time benchmarks\n"
 #endif
 printf("-maxwarnings needs an extra parameter with the amount of warnings\n");
 exit(1);
 } else {
 QTestLog::setMaxWarnings(qToInt(argv[++i]));
 }
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+} else if (strcmp(argv[i], "-nocrashhandler") == 0) {
+QTest::noCrashHandler = true;
+#endif
 } else if (strcmp(argv[i], "-keyevent-verbose") == 0) {
 QTest::keyVerbose = 1;
 #ifdef QTESTLIB_USE_VALGRIND
 } else if (strcmp(argv[i], "-callgrind") == 0) {
 if (QBenchmarkValgrindUtils::haveValgrind())
 /* Benchmarking: for each accumulation iteration*/
 bool invokeOk;
 do {
 QTestResult::setCurrentTestLocation(QTestResult::InitFunc);
-QMetaObject::invokeMethod(QTest::currentTestObject, "init");
+invokeMethod(QTest::currentTestObject, "init()");
 if (QTestResult::skipCurrentTest())
 break;
 QTestResult::setCurrentTestLocation(QTestResult::Func);
 Qt::DirectConnection);
 if (!invokeOk)
 QTestResult::addFailure("Unable to execute slot", __FILE__, __LINE__);
 QTestResult::setCurrentTestLocation(QTestResult::CleanupFunc);
-QMetaObject::invokeMethod(QTest::currentTestObject, "cleanup");
+invokeMethod(QTest::currentTestObject, "cleanup()");
 QTestResult::setCurrentTestLocation(QTestResult::NoWhere);
 // If this test method has a benchmark, repeat until all measurements are
 // acceptable.
 // The QBENCHMARK macro increases the number of iterations for each run until
 if (!gTable->isEmpty())
 QTestResult::setCurrentGlobalTestData(gTable->testData(curGlobalDataIndex));
 if (curGlobalDataIndex == 0) {
 QTestResult::setCurrentTestLocation(QTestResult::DataFunc);
-QTest::qt_snprintf(member, 512, "%s_data", slot);
+QTest::qt_snprintf(member, 512, "%s_data()", slot);
-QMetaObject::invokeMethod(QTest::currentTestObject, member, Qt::DirectConnection);
+invokeMethod(QTest::currentTestObject, member);
 // if we encounter a SkipAll in the _data slot, we skip the whole
 // testfunction, no matter how much global data exists
 if (QTestResult::skipCurrentTest()) {
 QTestResult::setCurrentGlobalTestData(0);
 break;
 QTestLog::startLogging();
 QTestResult::setCurrentTestFunction("initTestCase");
 QTestResult::setCurrentTestLocation(QTestResult::DataFunc);
 QTestTable::globalTestTable();
-QMetaObject::invokeMethod(testObject, "initTestCase_data", Qt::DirectConnection);
+invokeMethod(testObject, "initTestCase_data()");
 if (!QTestResult::skipCurrentTest() && !QTest::currentTestFailed()) {
 QTestResult::setCurrentTestLocation(QTestResult::InitFunc);
-QMetaObject::invokeMethod(testObject, "initTestCase");
+invokeMethod(testObject, "initTestCase()");
 // finishedCurrentTestFunction() resets QTestResult::testFailed(), so use a local copy.
 const bool previousFailed = QTestResult::testFailed();
 QTestResult::finishedCurrentTestFunction();
 }
 }
 QTestResult::setSkipCurrentTest(false);
 QTestResult::setCurrentTestFunction("cleanupTestCase");
-QMetaObject::invokeMethod(testObject, "cleanupTestCase");
+invokeMethod(testObject, "cleanupTestCase()");
 }
 QTestResult::finishedCurrentTestFunction();
 QTestResult::setCurrentTestFunction(0);
 QTestTable::clearGlobalTestTable();
 for (int i = 0; fatalSignals[i]; ++i) {
 sigaction(fatalSignals[i], &act, &oldact);
 #ifndef Q_WS_QWS
 // Don't overwrite any non-default handlers
 // however, we need to replace the default QWS handlers
-if (oldact.sa_flags & SA_SIGINFO || oldact.sa_handler != SIG_DFL) {
+if (
+#ifdef SA_SIGINFO
+oldact.sa_flags & SA_SIGINFO ||
+#endif
+oldact.sa_handler != SIG_DFL) {
 sigaction(fatalSignals[i], &oldact, 0);
 } else
 #endif
 {
 sigaddset(&handledSignals, fatalSignals[i]);
 } else
 #endif
 {
 #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
-FatalSignalHandler handler;
+QScopedPointer<FatalSignalHandler> handler;
+if (!noCrashHandler)
+handler.reset(new FatalSignalHandler);
 #endif
 qInvokeTestMethods(testObject);
 }
 #ifndef QT_NO_EXCEPTIONS

changeset 30	5dc02b23752f
parent 19	fcece45ef507
child 33	3e2da88830cd