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>
This commit is contained in:
parent
a2229efe74
commit
d7305c1094
@ -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
|
||||
}
|
||||
|
||||
/*!
|
||||
|
Loading…
Reference in New Issue
Block a user