diff options
| author | dac <qt-info@nokia.com> | 2010-07-27 14:15:33 +1000 |
|---|---|---|
| committer | dac <qt-info@nokia.com> | 2010-07-27 14:15:33 +1000 |
| commit | 1169253f038774d4a6e2ce8b07b8ec9762ba009d (patch) | |
| tree | 5b9878a36fd239288ba6c20e9df2cf46cf58cf61 /features/systemtest.prf | |
| parent | 1889676f0e8e7b0bf9278084c4bc9dcf59274534 (diff) | |
Add new QTestIDE class to enable easier integration with creator.
Fix some build problems and "make test" problems on Linux.
Remove examples directory, no longer required.
Diffstat (limited to 'features/systemtest.prf')
| -rw-r--r-- | features/systemtest.prf | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/features/systemtest.prf b/features/systemtest.prf index 9cfda0e..72bc6e4 100644 --- a/features/systemtest.prf +++ b/features/systemtest.prf @@ -10,20 +10,21 @@ unix:!mac:!symbian { fi QMAKE_EXTRA_TARGETS+=symlink - testapp_symlink.commands = \ - for app in $$TESTAPPS; do \ - APPPATH=$$BUILDROOT/tests/qtuitest/testapps/\$\$app; \ - [ -d \$\$APPPATH ] || continue; \ - ln -sf \$\$APPPATH/\$\$app $$BUILDDIR/\$\$app; \ - done - QMAKE_EXTRA_TARGETS+=testapp_symlink - - test.commands = PATH=$$BUILDDIR:\$\$PATH QTUITEST_INCLUDE_PATH=$$SRCROOT/tests/shared:\$\$QTUITEST_INCLUDE_PATH $$[QT_INSTALL_BINS]/qtuitestrunner $$BUILDDIR/$$SOURCES $(ARGS) - test.depends = symlink testapp_symlink +# testapp_symlink.commands = \ +# for app in $$TESTAPPS; do \ +# APPPATH=$$BUILDROOT/tests/qtuitest/testapps/\$\$app; \ +# [ -d \$\$APPPATH ] || continue; \ +# ln -sf \$\$APPPATH/\$\$app $$BUILDDIR/\$\$app; \ +# done +# QMAKE_EXTRA_TARGETS+=testapp_symlink + + test.commands = PATH=$$BUILDDIR:$$BUILDROOT/bin:\$\$PATH QTUITEST_INCLUDE_PATH=$$SRCROOT/tests/shared:\$\$QTUITEST_INCLUDE_PATH $$[QT_INSTALL_BINS]/qtuitestrunner $$BUILDDIR/$$SOURCES $(ARGS) +# test.depends = symlink testapp_symlink + test.depends = symlink QMAKE_EXTRA_TARGETS+=test - storetest.commands = PATH=$$[QT_INSTALL_BINS]:$$BUILDDIR:\$\$PATH BUILDDIR=$$BUILDDIR perl $$SRCROOT/scripts/storetest.pl $$BUILDDIR/$$SOURCES $(ARGS) - storetest.depends = symlink testapp_symlink + storetest.commands = PATH=$$[QT_INSTALL_BINS]:$$BUILDDIR/bin:\$\$PATH BUILDDIR=$$BUILDDIR perl $$SRCROOT/scripts/storetest.pl $$BUILDDIR/$$SOURCES $(ARGS) + storetest.depends = symlink QMAKE_EXTRA_TARGETS+=storetest } |