summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-08-29 11:47:57 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-29 06:49:39 +0200
commitd7305c10948f501450b6b3358d261217d13c6d6e (patch)
treeda2195431a1d338ead41a154020d475d6c22ebd2
parenta2229efe741aa4b92be2bfb6c3c0310a29baee64 (diff)
Remove the QTEST_NOEXITCODE define.
Tests that are expected to return a non-zero exitcode should be marked with "CONFIG+=insignificant_test" in their .pro file. Change-Id: Iebb9c7129c08833ed517115f569086d6fcfe827b Reviewed-on: http://codereview.qt.nokia.com/3689 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--src/testlib/qtestcase.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index a9774599e8..b6aaa34756 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1891,10 +1891,6 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
}
#endif
-#if defined(QTEST_NOEXITCODE)
- return 0;
-#else
-
#ifdef QTESTLIB_USE_VALGRIND
if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess)
return callgrindChildExitCode;
@@ -1902,8 +1898,6 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
// make sure our exit code is never going above 127
// since that could wrap and indicate 0 test fails
return qMin(QTestResult::failCount(), 127);
-
-#endif
}
/*!