summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/plugin
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-11-07 16:46:52 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-11 02:45:05 +0100
commit94fc8750797ffd3ef867d0cdc7849492cfee2c23 (patch)
tree2be26c742cd693cf9683b10a8cea2b17a0eac8da /tests/auto/corelib/plugin
parentb0a7af6b4debecd7226289f278e5acf571d80c64 (diff)
Cleanup corelib autotests
Tidy the autotest .pro files. Most autotest .pro files should look like this: CONFIG += testcase TARGET = tst_something QT = core testlib SOURCES = tst_something.cpp Change-Id: I877c2194e9fa9dd13478d117895e1e255a948ad7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/plugin')
-rw-r--r--tests/auto/corelib/plugin/qlibrary/tst/tst.pro27
-rw-r--r--tests/auto/corelib/plugin/qplugin/tst_qplugin.pro5
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/tst/tst.pro21
-rw-r--r--tests/auto/corelib/plugin/quuid/test/test.pro24
4 files changed, 35 insertions, 42 deletions
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
index c5035a8d67..a1854ad419 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
+++ b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
@@ -1,22 +1,21 @@
CONFIG += testcase
-SOURCES += ../tst_qlibrary.cpp
-TARGET = ../tst_qlibrary
+TARGET = ../tst_qlibrary
QT = core testlib
+SOURCES = ../tst_qlibrary.cpp
win32 {
- CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qlibrary
-} else {
- TARGET = ../../release/tst_qlibrary
- }
+ CONFIG(debug, debug|release) {
+ TARGET = ../../debug/tst_qlibrary
+ } else {
+ TARGET = ../../release/tst_qlibrary
+ }
}
-wince*: {
- addFiles.files = ../*.dll ../*.dl2 ../mylib_noextension
- addFiles.path = .
- DEPLOYMENT += addFiles
- DEFINES += SRCDIR=\\\"\\\"
+wince* {
+ addFiles.files = ../*.dll ../*.dl2 ../mylib_noextension
+ addFiles.path = .
+ DEPLOYMENT += addFiles
+ DEFINES += SRCDIR=\\\"\\\"
} else {
- DEFINES += SRCDIR=\\\"$$PWD/../\\\"
+ DEFINES += SRCDIR=\\\"$$PWD/../\\\"
}
-
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
index 894be1c13b..a569cfffb7 100644
--- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
@@ -1,10 +1,9 @@
CONFIG += testcase
TARGET = tst_qplugin
-
-SOURCES = tst_qplugin.cpp
QT = core testlib
+SOURCES = tst_qplugin.cpp
-wince*: {
+wince* {
plugins.files = plugins/*
plugins.path = plugins
DEPLOYMENT += plugins
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
index 4a11bf4935..8714597988 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
@@ -1,25 +1,22 @@
CONFIG += testcase
-SOURCES += ../tst_qpluginloader.cpp
TARGET = ../tst_qpluginloader
QT = core testlib
-HEADERS += ../theplugin/plugininterface.h
+SOURCES = ../tst_qpluginloader.cpp
+HEADERS = ../theplugin/plugininterface.h
+DEFINES += SRCDIR=\\\"$$PWD/../\\\"
win32 {
- CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qpluginloader
-} else {
- TARGET = ../../release/tst_qpluginloader
- }
+ CONFIG(debug, debug|release) {
+ TARGET = ../../debug/tst_qpluginloader
+ } else {
+ TARGET = ../../release/tst_qpluginloader
+ }
}
-
-wince*: {
+wince* {
addFiles.files = $$OUT_PWD/../bin/*.dll
addFiles.path = bin
DEPLOYMENT += addFiles
}
-DEFINES += SRCDIR=\\\"$$PWD/../\\\"
-mac*:CONFIG+=insignificant_test
-
CONFIG += insignificant_test # QTBUG-21402
diff --git a/tests/auto/corelib/plugin/quuid/test/test.pro b/tests/auto/corelib/plugin/quuid/test/test.pro
index 0063493821..4999177a48 100644
--- a/tests/auto/corelib/plugin/quuid/test/test.pro
+++ b/tests/auto/corelib/plugin/quuid/test/test.pro
@@ -1,22 +1,20 @@
CONFIG += testcase
-
-QT = core testlib
-SOURCES += ../tst_quuid.cpp
TARGET = tst_quuid
+QT = core testlib
+SOURCES = ../tst_quuid.cpp
CONFIG(debug_and_release_target) {
- CONFIG(debug, debug|release) {
- DESTDIR = ../debug
- } else {
- DESTDIR = ../release
- }
+ CONFIG(debug, debug|release) {
+ DESTDIR = ../debug
+ } else {
+ DESTDIR = ../release
+ }
} else {
- DESTDIR = ..
+ DESTDIR = ..
}
wince* {
- addFile_processUniqueness.files = $$OUT_PWD/../testProcessUniqueness/testProcessUniqueness.exe
- addFile_processUniqueness.path = testProcessUniqueness
-
- DEPLOYMENT += addFile_processUniqueness
+ addFile_processUniqueness.files = $$OUT_PWD/../testProcessUniqueness/testProcessUniqueness.exe
+ addFile_processUniqueness.path = testProcessUniqueness
+ DEPLOYMENT += addFile_processUniqueness
}