diff options
| author | Janne Hämäläinen <janne.a.hamalainen@nokia.com> | 2010-02-04 09:19:34 (GMT) |
|---|---|---|
| committer | Adrian Constantin <adrian.constantin@nokia.com> | 2010-02-08 09:54:49 (GMT) |
| commit | 7b350628d231f8e491172dd00cd8ef5f7bda331e (patch) | |
| tree | 01e73450e8d244565ea06a1f6f88a202f95cd91b /mkspecs/features | |
| parent | 12db2eac862eb1e24cb106da0a33130d4a90a80b (diff) | |
| download | Qt-7b350628d231f8e491172dd00cd8ef5f7bda331e.zip Qt-7b350628d231f8e491172dd00cd8ef5f7bda331e.tar.gz Qt-7b350628d231f8e491172dd00cd8ef5f7bda331e.tar.bz2 | |
Do not run the tests automatically during install.
A separate "check" rule added for running the tests. Use
"make check" to run the tests.
Task-number: QTPROD-442
Reviewed-by: Harald Fernengel
Reviewed-by: Rohan McGovern
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index 525e7b2..e0b22f2 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -13,23 +13,19 @@ symbian:{ # prefix test binary with tst_ !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") -######################################################################## -# Use install rule to run test application. -# This lets you do 'make install' on a test to both build and run it, -# and lets you easily build and run all tests from the parent directory. -# ---------------------------------------------------------------------- -runme.files = -runme.path = . -!isEmpty(DESTDIR): runme.commands = cd ./$(DESTDIR) && -macx: runme.commands += ./$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) -else:unix: runme.commands += ./$(QMAKE_TARGET) +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):runme.commands += debug\\$(QMAKE_TARGET) - else:runme.commands += release\\$(QMAKE_TARGET) + CONFIG(debug, debug|release):check.commands += debug\\$(QMAKE_TARGET) + else:check.commands += release\\$(QMAKE_TARGET) } -embedded: runme.commands += -qws -INSTALLS += runme +embedded: check.commands += -qws +QMAKE_EXTRA_TARGETS += check -######################################################################## +target.path += $$[QT_INSTALL_PREFIX]/tests/qt4 +INSTALLS += target |