Skip to content

Commit f86ca84

Browse files
author
Qt Continuous Integration System
committed
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
2 parents 1c256b2 + 9be9492 commit f86ca84

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

mkspecs/features/testcase.prf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ embedded: check.commands += -qws
3838

3939
# Allow for custom arguments to tests
4040
check.commands += $(TESTARGS)
41+
42+
# If the test is marked as insignificant, discard the exit code
43+
insignificant_test:check.commands = -$${check.commands}
44+
4145
QMAKE_EXTRA_TARGETS *= check
4246

4347
!debug_and_release|build_pass {

0 commit comments

Comments
 (0)