diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2012-06-29 12:05:10 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 04:57:04 +0200 |
| commit | 551e1e63d9da18787ae72fc3f0e76f28dbe5f7e3 (patch) | |
| tree | 4ca2c7f693c7e9046e1b7847b0bfdbfb98c71e45 /tests | |
| parent | 4182a3afac5321b21496ae276446e3ba46d29fd4 (diff) | |
Fixed several unit tests to work in shadow builds
- qlogging, qthreadstorage, qnetworkreply, qapplication, qfile, qprocess
Added app_bundle and debug_and_release_target to CONFIG
Change-Id: I6212902c449520dc016da9590149a423069cc38c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
9 files changed, 9 insertions, 11 deletions
diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro index 6e9b86d753..57e9ba30ae 100644 --- a/tests/auto/corelib/global/qlogging/test/test.pro +++ b/tests/auto/corelib/global/qlogging/test/test.pro @@ -1,4 +1,5 @@ CONFIG += testcase parallel_test +CONFIG -= app_bundle debug_and_release_target TARGET = ../tst_qlogging QT = core testlib SOURCES = ../tst_qlogging.cpp diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro index 39f47a0ae5..dedf7f18b1 100644 --- a/tests/auto/corelib/io/qfile/test/test.pro +++ b/tests/auto/corelib/io/qfile/test/test.pro @@ -1,5 +1,6 @@ CONFIG += testcase CONFIG += parallel_test +CONFIG -= app_bundle debug_and_release_target QT = core-private core network testlib TARGET = ../tst_qfile SOURCES = ../tst_qfile.cpp diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro index 6d5dd29af0..b3eeb5999a 100644 --- a/tests/auto/corelib/io/qprocess/test/test.pro +++ b/tests/auto/corelib/io/qprocess/test/test.pro @@ -1,5 +1,6 @@ CONFIG += testcase CONFIG += parallel_test +CONFIG -= app_bundle debug_and_release_target QT = core testlib network embedded: QT += gui SOURCES = ../tst_qprocess.cpp diff --git a/tests/auto/corelib/thread/qthreadstorage/test/test.pro b/tests/auto/corelib/thread/qthreadstorage/test/test.pro index cfbf5bf5a4..0dc8656920 100644 --- a/tests/auto/corelib/thread/qthreadstorage/test/test.pro +++ b/tests/auto/corelib/thread/qthreadstorage/test/test.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = ../tst_qthreadstorage -CONFIG -= app_bundle +CONFIG -= app_bundle debug_and_release_target CONFIG += console QT = core testlib SOURCES = ../tst_qthreadstorage.cpp diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index 302a6036be..2c43aa0aa2 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -1,6 +1,7 @@ CONFIG += testcase testcase.timeout = 600 # this test is slow CONFIG += parallel_test +CONFIG -= app_bundle debug_and_release_target QT -= gui SOURCES += ../tst_qnetworkreply.cpp TARGET = ../tst_qnetworkreply diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro index 97768eac74..a10ff71b05 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro @@ -1,5 +1,5 @@ QT += widgets -CONFIG -= app_bundle +CONFIG -= app_bundle debug_and_release_target DESTDIR = ./ diff --git a/tests/auto/widgets/kernel/qapplication/modal/modal.pro b/tests/auto/widgets/kernel/qapplication/modal/modal.pro index 05e5a7ada7..a34871d2aa 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/modal.pro +++ b/tests/auto/widgets/kernel/qapplication/modal/modal.pro @@ -2,6 +2,6 @@ QT += widgets SOURCES += main.cpp \ base.cpp DESTDIR = ./ -CONFIG -= app_bundle +CONFIG -= app_bundle debug_and_release_target HEADERS += base.h diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro index 61035cc24b..37af570552 100644 --- a/tests/auto/widgets/kernel/qapplication/test/test.pro +++ b/tests/auto/widgets/kernel/qapplication/test/test.pro @@ -1,4 +1,5 @@ CONFIG += testcase +CONFIG -= app_bundle debug_and_release_target QT += widgets widgets-private testlib QT += core-private gui-private @@ -6,14 +7,6 @@ QT += core-private gui-private SOURCES += ../tst_qapplication.cpp TARGET = ../tst_qapplication -win32 { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qapplication -} else { - TARGET = ../../release/tst_qapplication - } -} - TESTDATA = ../test/test.pro ../tmp/README SUBPROGRAMS = desktopsettingsaware modal diff --git a/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro b/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro index 3c3b2d0767..3e32a6798d 100644 --- a/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro +++ b/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro @@ -1,4 +1,5 @@ QT += widgets +CONFIG -= app_bundle debug_and_release_target SOURCES += main.cpp DESTDIR = ./ |