diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 16:06:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 16:06:20 (GMT) |
| commit | 19f53dd23c29d9a6b256ea1473b118abcde3cc5a (patch) | |
| tree | 483e6a45a93d9c6db05c53e48ca7a0dfed05d233 /mkspecs/features | |
| parent | 12fc4ad4189f059a806bdf4f50fe090ed7031352 (diff) | |
| parent | 22bfd2b05a72e1e7d7babcc9c5d824dd87903b6f (diff) | |
| download | Qt-19f53dd23c29d9a6b256ea1473b118abcde3cc5a.zip Qt-19f53dd23c29d9a6b256ea1473b118abcde3cc5a.tar.gz Qt-19f53dd23c29d9a6b256ea1473b118abcde3cc5a.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
tests: allow unstable tests to be marked with CONFIG+=insignificant_test
Fix focusScopeItemChange setting crash
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
symbian - handle path being passed as part of filename in QTranslator
Symbian - fix compile error when default configured
Compile when -no-rtti is specified as a configure option
Ensure that the RC_FILE is correctly handled in a single configuration
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/testcase.prf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 7a7c9e3..eb0aa9f 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -38,6 +38,10 @@ embedded: check.commands += -qws # Allow for custom arguments to tests check.commands += $(TESTARGS) + +# If the test is marked as insignificant, discard the exit code +insignificant_test:check.commands = -$${check.commands} + QMAKE_EXTRA_TARGETS *= check !debug_and_release|build_pass { |