diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 16:28:32 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 16:28:32 (GMT) |
| commit | ec8b0dc65ead3fc1fb557e52dd14b4c0073ff1a9 (patch) | |
| tree | 0167efa4640468a4d72b834cfdb23366e55874d8 | |
| parent | 84ad4e1b4082f85463124e834b4502ff7efce7df (diff) | |
| download | Qt-ec8b0dc65ead3fc1fb557e52dd14b4c0073ff1a9.zip Qt-ec8b0dc65ead3fc1fb557e52dd14b4c0073ff1a9.tar.gz Qt-ec8b0dc65ead3fc1fb557e52dd14b4c0073ff1a9.tar.bz2 | |
Disable some tests because INTEGRITY doesn't support shared libraries.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| -rw-r--r-- | tests/auto/qlibrary/qlibrary.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qplugin/qplugin.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qpluginloader/qpluginloader.pro | 4 | ||||
| -rw-r--r-- | tests/auto/selftests/selftests.pro | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/qlibrary/qlibrary.pro b/tests/auto/qlibrary/qlibrary.pro index 5dc129f..b351753 100644 --- a/tests/auto/qlibrary/qlibrary.pro +++ b/tests/auto/qlibrary/qlibrary.pro @@ -6,6 +6,8 @@ symbian: { # Can't build two versions of lib with same name in symbian, so just build one SUBDIRS = lib2 \ tst +} else:integrity { +# no shared support, empty test } else { SUBDIRS = lib \ lib2 \ diff --git a/tests/auto/qplugin/qplugin.pro b/tests/auto/qplugin/qplugin.pro index 37a12da..1dcf0a7 100644 --- a/tests/auto/qplugin/qplugin.pro +++ b/tests/auto/qplugin/qplugin.pro @@ -22,7 +22,7 @@ mac { SUBDIRS = debugplugin releaseplugin tst_qplugin_pro.depends += debugplugin releaseplugin } -SUBDIRS += tst_qplugin.pro +!integrity:SUBDIRS += tst_qplugin.pro CONFIG += parallel_test diff --git a/tests/auto/qpluginloader/qpluginloader.pro b/tests/auto/qpluginloader/qpluginloader.pro index 6e41b4c..cb25b0f 100644 --- a/tests/auto/qpluginloader/qpluginloader.pro +++ b/tests/auto/qpluginloader/qpluginloader.pro @@ -1,10 +1,10 @@ QT = core TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = lib \ +!integrity:SUBDIRS = lib \ theplugin \ tst -!win32: !macx-*: !symbian: SUBDIRS += almostplugin +!win32: !macx-*: !symbian: !integrity: SUBDIRS += almostplugin TARGET = tst_qpluginloader # no special install rule for subdir diff --git a/tests/auto/selftests/selftests.pro b/tests/auto/selftests/selftests.pro index 74cd075..1494e38 100644 --- a/tests/auto/selftests/selftests.pro +++ b/tests/auto/selftests/selftests.pro @@ -12,5 +12,6 @@ INSTALLS = QT = core +integrity: SUBDIRS -= test CONFIG += parallel_test |