Moving relevant tests to corelib/plugin

Task-number: QTBUG-21066

Change-Id: I918f6ef6fb825d7cf94d6b42322b2c2eb5c52aaa
Reviewed-on: http://codereview.qt.nokia.com/3604
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

49 files changed, 8 insertions, 5 deletions

diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 8da834d111..655a971193 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -19,15 +19,12 @@ SUBDIRS=\
    qexplicitlyshareddatapointer \
    qfreelist \
    qhash \
-   qlibrary \
    qline \
    qmap \
    qmargins \
    qmutex \
    qmutexlocker \
    qobjectrace \
-   qplugin \
-   qpluginloader \
    qpoint \
    qqueue \
    qreadlocker \
@@ -61,7 +58,6 @@ SUBDIRS=\
    qtimeline \
    qtmd5 \
    qtokenautomaton \
-   quuid \
    qvarlengtharray \
    qvector \
    qwaitcondition \
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index 5764ccc3e1..0d19a2cb04 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -5,4 +5,5 @@ SUBDIRS=\
    concurrent \
    global \
    io \
-   kernel
+   kernel \
+   plugin
diff --git a/tests/auto/corelib/plugin/plugin.pro b/tests/auto/corelib/plugin/plugin.pro
new file mode 100644
index 0000000000..24de36e4ec
--- /dev/null
+++ b/tests/auto/corelib/plugin/plugin.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qlibrary \
+    qplugin \
+    qpluginloader \
+    quuid
diff --git a/tests/auto/qlibrary/.gitignore b/tests/auto/corelib/plugin/qlibrary/.gitignore
index 38963f2235..38963f2235 100644
--- a/tests/auto/qlibrary/.gitignore
+++ b/tests/auto/corelib/plugin/qlibrary/.gitignore
diff --git a/tests/auto/qlibrary/lib/lib.pro b/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
index 6d80881cd2..6d80881cd2 100644
--- a/tests/auto/qlibrary/lib/lib.pro
+++ b/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
diff --git a/tests/auto/qlibrary/lib/mylib.c b/tests/auto/corelib/plugin/qlibrary/lib/mylib.c
index f1a2b7a002..f1a2b7a002 100644
--- a/tests/auto/qlibrary/lib/mylib.c
+++ b/tests/auto/corelib/plugin/qlibrary/lib/mylib.c
diff --git a/tests/auto/qlibrary/lib2/lib2.pro b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
index b441569e5a..b441569e5a 100644
--- a/tests/auto/qlibrary/lib2/lib2.pro
+++ b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
diff --git a/tests/auto/qlibrary/lib2/mylib.c b/tests/auto/corelib/plugin/qlibrary/lib2/mylib.c
index f824a3a82d..f824a3a82d 100644
--- a/tests/auto/qlibrary/lib2/mylib.c
+++ b/tests/auto/corelib/plugin/qlibrary/lib2/mylib.c
diff --git a/tests/auto/qlibrary/library_path/invalid.so b/tests/auto/corelib/plugin/qlibrary/library_path/invalid.so
index 4f8a56fe95..4f8a56fe95 100644
--- a/tests/auto/qlibrary/library_path/invalid.so
+++ b/tests/auto/corelib/plugin/qlibrary/library_path/invalid.so
diff --git a/tests/auto/qlibrary/qlibrary.pro b/tests/auto/corelib/plugin/qlibrary/qlibrary.pro
index 5dc129fbf9..5dc129fbf9 100644
--- a/tests/auto/qlibrary/qlibrary.pro
+++ b/tests/auto/corelib/plugin/qlibrary/qlibrary.pro
diff --git a/tests/auto/qlibrary/tst/tst.pro b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
index 28c40b0b42..28c40b0b42 100644
--- a/tests/auto/qlibrary/tst/tst.pro
+++ b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
diff --git a/tests/auto/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
index 675d0e6ab6..675d0e6ab6 100644
--- a/tests/auto/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
diff --git a/tests/auto/qplugin/.gitignore b/tests/auto/corelib/plugin/qplugin/.gitignore
index 671b21a458..671b21a458 100644
--- a/tests/auto/qplugin/.gitignore
+++ b/tests/auto/corelib/plugin/qplugin/.gitignore
diff --git a/tests/auto/qplugin/debugplugin/debugplugin.pro b/tests/auto/corelib/plugin/qplugin/debugplugin/debugplugin.pro
index d0762fc101..d0762fc101 100644
--- a/tests/auto/qplugin/debugplugin/debugplugin.pro
+++ b/tests/auto/corelib/plugin/qplugin/debugplugin/debugplugin.pro
diff --git a/tests/auto/qplugin/debugplugin/main.cpp b/tests/auto/corelib/plugin/qplugin/debugplugin/main.cpp
index b1538963d8..b1538963d8 100644
--- a/tests/auto/qplugin/debugplugin/main.cpp
+++ b/tests/auto/corelib/plugin/qplugin/debugplugin/main.cpp
diff --git a/tests/auto/qplugin/qplugin.pro b/tests/auto/corelib/plugin/qplugin/qplugin.pro
index 37a12da732..37a12da732 100644
--- a/tests/auto/qplugin/qplugin.pro
+++ b/tests/auto/corelib/plugin/qplugin/qplugin.pro
diff --git a/tests/auto/qplugin/releaseplugin/main.cpp b/tests/auto/corelib/plugin/qplugin/releaseplugin/main.cpp
index 3be9a7415d..3be9a7415d 100644
--- a/tests/auto/qplugin/releaseplugin/main.cpp
+++ b/tests/auto/corelib/plugin/qplugin/releaseplugin/main.cpp
diff --git a/tests/auto/qplugin/releaseplugin/releaseplugin.pro b/tests/auto/corelib/plugin/qplugin/releaseplugin/releaseplugin.pro
index ce66aaf7cb..ce66aaf7cb 100644
--- a/tests/auto/qplugin/releaseplugin/releaseplugin.pro
+++ b/tests/auto/corelib/plugin/qplugin/releaseplugin/releaseplugin.pro
diff --git a/tests/auto/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
index c7ea963225..c7ea963225 100644
--- a/tests/auto/qplugin/tst_qplugin.cpp
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
diff --git a/tests/auto/qplugin/tst_qplugin.pro b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
index 3629fb36a1..3629fb36a1 100644
--- a/tests/auto/qplugin/tst_qplugin.pro
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
diff --git a/tests/auto/qpluginloader/.gitignore b/tests/auto/corelib/plugin/qpluginloader/.gitignore
index 6b2fa3a715..6b2fa3a715 100644
--- a/tests/auto/qpluginloader/.gitignore
+++ b/tests/auto/corelib/plugin/qpluginloader/.gitignore
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.cpp b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.cpp
index 70596c0113..70596c0113 100644
--- a/tests/auto/qpluginloader/almostplugin/almostplugin.cpp
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.cpp
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.h b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.h
index 0021180b36..0021180b36 100644
--- a/tests/auto/qpluginloader/almostplugin/almostplugin.h
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.h
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.pro b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.pro
index b45509ef01..b45509ef01 100644
--- a/tests/auto/qpluginloader/almostplugin/almostplugin.pro
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.pro
diff --git a/tests/auto/qpluginloader/elftest/.gitattributes b/tests/auto/corelib/plugin/qpluginloader/elftest/.gitattributes
index 891192ca94..891192ca94 100644
--- a/tests/auto/qpluginloader/elftest/.gitattributes
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/.gitattributes
diff --git a/tests/auto/qpluginloader/elftest/corrupt1.elf64.so b/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt1.elf64.so
index 12ce7362dc..12ce7362dc 100755
--- a/tests/auto/qpluginloader/elftest/corrupt1.elf64.so
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt1.elf64.so
diff --git a/tests/auto/qpluginloader/elftest/corrupt2.elf64.so b/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so
index 11fdc2c118..11fdc2c118 100755
--- a/tests/auto/qpluginloader/elftest/corrupt2.elf64.so
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so
diff --git a/tests/auto/qpluginloader/elftest/corrupt3.elf64.so b/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt3.elf64.so
index 94a2bc3560..94a2bc3560 100755
--- a/tests/auto/qpluginloader/elftest/corrupt3.elf64.so
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt3.elf64.so
diff --git a/tests/auto/qpluginloader/elftest/debugobj.so b/tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so
index f0ee0569a3..f0ee0569a3 100644
--- a/tests/auto/qpluginloader/elftest/debugobj.so
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so
diff --git a/tests/auto/qpluginloader/elftest/garbage1.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage1.so
index 0c7453077f..0c7453077f 100644
--- a/tests/auto/qpluginloader/elftest/garbage1.so
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage1.so
diff --git a/tests/auto/qpluginloader/elftest/garbage2.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage2.so
index c06338e0c8..c06338e0c8 100644
--- a/tests/auto/qpluginloader/elftest/garbage2.so
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage2.so
diff --git a/tests/auto/qpluginloader/elftest/garbage3.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage3.so
index a24c523a77..a24c523a77 100644
--- a/tests/auto/qpluginloader/elftest/garbage3.so
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage3.so
diff --git a/tests/auto/qpluginloader/elftest/garbage4.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage4.so
index 4f45cf5157..4f45cf5157 100644
--- a/tests/auto/qpluginloader/elftest/garbage4.so
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage4.so
diff --git a/tests/auto/qpluginloader/elftest/garbage5.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage5.so
index f8c0a1d544..f8c0a1d544 100644
--- a/tests/auto/qpluginloader/elftest/garbage5.so
+++ b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage5.so
diff --git a/tests/auto/qpluginloader/lib/lib.pro b/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
index ce9bf13c25..ce9bf13c25 100644
--- a/tests/auto/qpluginloader/lib/lib.pro
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
diff --git a/tests/auto/qpluginloader/lib/mylib.c b/tests/auto/corelib/plugin/qpluginloader/lib/mylib.c
index dc43c35815..dc43c35815 100644
--- a/tests/auto/qpluginloader/lib/mylib.c
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/mylib.c
diff --git a/tests/auto/qpluginloader/qpluginloader.pro b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
index 6e41b4c96a..6e41b4c96a 100644
--- a/tests/auto/qpluginloader/qpluginloader.pro
+++ b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
diff --git a/tests/auto/qpluginloader/theplugin/plugininterface.h b/tests/auto/corelib/plugin/qpluginloader/theplugin/plugininterface.h
index 48d8443ba1..48d8443ba1 100644
--- a/tests/auto/qpluginloader/theplugin/plugininterface.h
+++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/plugininterface.h
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.cpp b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.cpp
index fdf599c875..fdf599c875 100644
--- a/tests/auto/qpluginloader/theplugin/theplugin.cpp
+++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.cpp
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.h b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h
index 5b738696e0..5b738696e0 100644
--- a/tests/auto/qpluginloader/theplugin/theplugin.h
+++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.pro b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro
index 44b46b439f..44b46b439f 100644
--- a/tests/auto/qpluginloader/theplugin/theplugin.pro
+++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro
diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
index 7ae6d89143..7ae6d89143 100644
--- a/tests/auto/qpluginloader/tst/tst.pro
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
index 76dbd48a14..76dbd48a14 100644
--- a/tests/auto/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
diff --git a/tests/auto/quuid/.gitignore b/tests/auto/corelib/plugin/quuid/.gitignore
index 4ef3142f0f..4ef3142f0f 100644
--- a/tests/auto/quuid/.gitignore
+++ b/tests/auto/corelib/plugin/quuid/.gitignore
diff --git a/tests/auto/quuid/quuid.pro b/tests/auto/corelib/plugin/quuid/quuid.pro
index 461956f313..461956f313 100644
--- a/tests/auto/quuid/quuid.pro
+++ b/tests/auto/corelib/plugin/quuid/quuid.pro
diff --git a/tests/auto/quuid/test/test.pro b/tests/auto/corelib/plugin/quuid/test/test.pro
index 06ae3bd362..06ae3bd362 100644
--- a/tests/auto/quuid/test/test.pro
+++ b/tests/auto/corelib/plugin/quuid/test/test.pro
diff --git a/tests/auto/quuid/testProcessUniqueness/main.cpp b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp
index 085f56539d..085f56539d 100644
--- a/tests/auto/quuid/testProcessUniqueness/main.cpp
+++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp
diff --git a/tests/auto/quuid/testProcessUniqueness/testProcessUniqueness.pro b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness.pro
index 88df1a25d7..88df1a25d7 100644
--- a/tests/auto/quuid/testProcessUniqueness/testProcessUniqueness.pro
+++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness.pro
diff --git a/tests/auto/quuid/tst_quuid.cpp b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
index 5761ea1a8c..5761ea1a8c 100644
--- a/tests/auto/quuid/tst_quuid.cpp
+++ b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp