diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-05-22 17:54:33 +1000 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2011-01-17 16:20:26 +0100 |
commit | 6aa5f3b94c6f94b85218f119fdb00e103b5ee442 (patch) | |
tree | 8f25c1823d4256c0a9c234dc303458250ca2dc64 /mkspecs/features/qttest_p4.prf | |
parent | 216f01fec8a8c0d63ea42c5b4f8b1d9f493a3f5e (diff) | |
download | qt4-tools-6aa5f3b94c6f94b85218f119fdb00e103b5ee442.tar.gz |
Move `check' target for autotests into testcase.prf
testcase.prf is installed, thus allowing `make check' to work
outside of the Qt source tree.
(cherry picked from commit d29e1dda8fbc24087b9cf0bf08d929bef74f5c96)
Diffstat (limited to 'mkspecs/features/qttest_p4.prf')
-rw-r--r-- | mkspecs/features/qttest_p4.prf | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index e3faef12f4..0a78346d2c 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -1,5 +1,5 @@ isEmpty(TEMPLATE):TEMPLATE=app -CONFIG += qt warn_on console depend_includepath +CONFIG += qt warn_on console depend_includepath testcase qtAddLibrary(QtTest) @@ -13,39 +13,5 @@ symbian:{ # prefix test binary with tst_ !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") - -check.files = -check.path = . -!isEmpty(DESTDIR): check.commands = cd ./$(DESTDIR) && -macx: check.commands += ./$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) -else:unix: check.commands += ./$(QMAKE_TARGET) -else:win32: { - 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 = first -} 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 |