summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorBill King <bking@trolltech.com>2010-02-22 06:17:46 (GMT)
committerBill King <bking@trolltech.com>2010-02-22 06:17:46 (GMT)
commit30ae64eaf42a2d7f80f70fb01c77a6ebcdfd1e98 (patch)
tree9e3a314d517bf55a89d77bef59ffae7315b2d37a /mkspecs
parentf7e44781c9fa9118e9bdac37979ab2bbb10909c8 (diff)
downloadQt-30ae64eaf42a2d7f80f70fb01c77a6ebcdfd1e98.zip
Qt-30ae64eaf42a2d7f80f70fb01c77a6ebcdfd1e98.tar.gz
Qt-30ae64eaf42a2d7f80f70fb01c77a6ebcdfd1e98.tar.bz2
Fixes: make check not checking that target is up to date
Builds the target executable if needed before running the test LR on BKing's machine. Reviewed-by: Lincoln Ramsay
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qttest_p4.prf24
1 files changed, 22 insertions, 2 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index e0b22f2..53c0d74 100644
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -20,12 +20,32 @@ check.path = .
macx: check.commands += ./$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET)
else:unix: check.commands += ./$(QMAKE_TARGET)
else:win32: {
- CONFIG(debug, debug|release):check.commands += debug\\$(QMAKE_TARGET)
- else:check.commands += release\\$(QMAKE_TARGET)
+ CONFIG(debug, debug|release):check.commands += $(DESTDIR_TARGET)
+ else:check.commands += $(DESTDIR_TARGET)
}
embedded: check.commands += -qws
QMAKE_EXTRA_TARGETS += check
+!debug_and_release|build_pass {
+ check.depends = $(DESTDIR_TARGET)
+} else {
+ check.CONFIG = recursive
+ # In debug and release mode, only run the test once.
+ # Run debug if available, release otherwise.
+ debug_and_release {
+ check.target = dummy_check
+ check.recurse_target = check
+ debug {
+ real_check.depends = debug-check
+ real_check.target = check
+ QMAKE_EXTRA_TARGETS += real_check
+ } else {
+ real_check.depends = release-check
+ real_check.target = check
+ QMAKE_EXTRA_TARGETS += real_check
+ }
+ }
+}
target.path += $$[QT_INSTALL_PREFIX]/tests/qt4
INSTALLS += target