diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 19:23:02 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 19:23:02 +1000 |
| commit | f86ca84e783c34e701f3742902161cb365e6e940 (patch) | |
| tree | 17b263b4d9e4254fbe70dd82171457b1b503fbb3 | |
| parent | 1c256b23df43aec975da2c9e8629d102ad13bd93 (diff) | |
| parent | 9be94925138d11f9a2f191f9676665eb8f3e6d3a (diff) | |
| download | qt4-tools-f86ca84e783c34e701f3742902161cb365e6e940.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
tests: allow unstable tests to be marked with CONFIG+=insignificant_test
| -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 7a7c9e305a..eb0aa9fb85 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 { |