Fix testlib selftests on shadow build.

Changed to use QT_INSTALL_TESTS to install subtests.

Change-Id: I4a2a7bd2d3e7d6da34dbb922bf377bee98cdedb0
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

diff --git a/tests/auto/testlib/selftests/assert/assert.pro b/tests/auto/testlib/selftests/assert/assert.pro
index cfc6a0c..fcde038 100644 (file)
--- a/tests/auto/testlib/selftests/assert/assert.pro
+++ b/tests/auto/testlib/selftests/assert/assert.pro
@@ -5,3 +5,8 @@ mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
 TARGET = assert
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/badxml/badxml.pro b/tests/auto/testlib/selftests/badxml/badxml.pro
index 561c7e0..89ae8ee 100644 (file)
--- a/tests/auto/testlib/selftests/badxml/badxml.pro
+++ b/tests/auto/testlib/selftests/badxml/badxml.pro
@@ -6,3 +6,7 @@ CONFIG -= debug_and_release_target
 
 TARGET = badxml
 
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro
index baa996c..58329d6 100644 (file)
--- a/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = benchlibcallgrind
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro
index d1fe909..d5363eb 100644 (file)
--- a/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = benchlibeventcounter
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro
index 73173b0..df1bf2b 100644 (file)
--- a/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro
+++ b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = benchliboptions
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/cmptest/cmptest.pro b/tests/auto/testlib/selftests/cmptest/cmptest.pro
index ac392b0..bc72f23 100644 (file)
--- a/tests/auto/testlib/selftests/cmptest/cmptest.pro
+++ b/tests/auto/testlib/selftests/cmptest/cmptest.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = cmptest
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro
index 9dd1212..705da2f 100644 (file)
--- a/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro
+++ b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = commandlinedata
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/crashes/crashes.pro b/tests/auto/testlib/selftests/crashes/crashes.pro
index e9f0f3e..d9011ba 100644 (file)
--- a/tests/auto/testlib/selftests/crashes/crashes.pro
+++ b/tests/auto/testlib/selftests/crashes/crashes.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = crashes
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/datatable/datatable.pro b/tests/auto/testlib/selftests/datatable/datatable.pro
index 7c36d4a..ab01b60 100644 (file)
--- a/tests/auto/testlib/selftests/datatable/datatable.pro
+++ b/tests/auto/testlib/selftests/datatable/datatable.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = datatable
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/datetime/datetime.pro b/tests/auto/testlib/selftests/datetime/datetime.pro
index f73a763..c0efbc2 100644 (file)
--- a/tests/auto/testlib/selftests/datetime/datetime.pro
+++ b/tests/auto/testlib/selftests/datetime/datetime.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = datetime
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/differentexec/differentexec.pro b/tests/auto/testlib/selftests/differentexec/differentexec.pro
index 60000d1..d3ca2a2 100644 (file)
--- a/tests/auto/testlib/selftests/differentexec/differentexec.pro
+++ b/tests/auto/testlib/selftests/differentexec/differentexec.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = differentexec
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
index 4a72181..8e1bff4 100644 (file)
--- a/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
+++ b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = exceptionthrow
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/expectfail/expectfail.pro b/tests/auto/testlib/selftests/expectfail/expectfail.pro
index a2916b2..c08ff86 100644 (file)
--- a/tests/auto/testlib/selftests/expectfail/expectfail.pro
+++ b/tests/auto/testlib/selftests/expectfail/expectfail.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = expectfail
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/failinit/failinit.pro b/tests/auto/testlib/selftests/failinit/failinit.pro
index 9a78184..4b292b5 100644 (file)
--- a/tests/auto/testlib/selftests/failinit/failinit.pro
+++ b/tests/auto/testlib/selftests/failinit/failinit.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = failinit
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/failinitdata/failinitdata.pro b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro
index 7b0b15a..a3cbed2 100644 (file)
--- a/tests/auto/testlib/selftests/failinitdata/failinitdata.pro
+++ b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = failinitdata
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro
index 1f8652d..013eaaf 100644 (file)
--- a/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro
+++ b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = fetchbogus
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro
index f04a640..ff34998 100644 (file)
--- a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro
+++ b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro
@@ -7,3 +7,8 @@ CONFIG -= debug_and_release_target
 RESOURCES = findtestdata.qrc
 
 TARGET = findtestdata
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/float/float.pro b/tests/auto/testlib/selftests/float/float.pro
index 95980ee..5b4376e 100644 (file)
--- a/tests/auto/testlib/selftests/float/float.pro
+++ b/tests/auto/testlib/selftests/float/float.pro
@@ -5,3 +5,8 @@ mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
 TARGET = float
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/globaldata/globaldata.pro b/tests/auto/testlib/selftests/globaldata/globaldata.pro
index 3d49d35..240dd51 100644 (file)
--- a/tests/auto/testlib/selftests/globaldata/globaldata.pro
+++ b/tests/auto/testlib/selftests/globaldata/globaldata.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = globaldata
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/longstring/longstring.pro b/tests/auto/testlib/selftests/longstring/longstring.pro
index 9b393e9..0b311bd 100644 (file)
--- a/tests/auto/testlib/selftests/longstring/longstring.pro
+++ b/tests/auto/testlib/selftests/longstring/longstring.pro
@@ -4,6 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = longstring
 
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro
index 9ebdde5..e93d161 100644 (file)
--- a/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro
+++ b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = maxwarnings
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/multiexec/multiexec.pro b/tests/auto/testlib/selftests/multiexec/multiexec.pro
index 79ae010..8886531 100644 (file)
--- a/tests/auto/testlib/selftests/multiexec/multiexec.pro
+++ b/tests/auto/testlib/selftests/multiexec/multiexec.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = multiexec
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/printdatatags/printdatatags.pro b/tests/auto/testlib/selftests/printdatatags/printdatatags.pro
index cd06384..80acde2 100644 (file)
--- a/tests/auto/testlib/selftests/printdatatags/printdatatags.pro
+++ b/tests/auto/testlib/selftests/printdatatags/printdatatags.pro
@@ -5,3 +5,8 @@ mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
 TARGET = printdatatags
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro b/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro
index f1cf25d..86cfa09 100644 (file)
--- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro
+++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro
@@ -5,3 +5,8 @@ mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
 TARGET = printdatatagswithglobaltags
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro
index de8a7da..15fd236 100644 (file)
--- a/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro
+++ b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = qexecstringlist
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/singleskip/singleskip.pro b/tests/auto/testlib/selftests/singleskip/singleskip.pro
index f4bde92..f0f51a5 100644 (file)
--- a/tests/auto/testlib/selftests/singleskip/singleskip.pro
+++ b/tests/auto/testlib/selftests/singleskip/singleskip.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = singleskip
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/skip/skip.pro b/tests/auto/testlib/selftests/skip/skip.pro
index 8257621..65b41b9 100644 (file)
--- a/tests/auto/testlib/selftests/skip/skip.pro
+++ b/tests/auto/testlib/selftests/skip/skip.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = skip
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/skipinit/skipinit.pro b/tests/auto/testlib/selftests/skipinit/skipinit.pro
index 848252e..acd6a41 100644 (file)
--- a/tests/auto/testlib/selftests/skipinit/skipinit.pro
+++ b/tests/auto/testlib/selftests/skipinit/skipinit.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = skipinit
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro
index 762543a..e3dc586 100644 (file)
--- a/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro
+++ b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = skipinitdata
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/sleep/sleep.pro b/tests/auto/testlib/selftests/sleep/sleep.pro
index e0ae72f..4ff843a 100644 (file)
--- a/tests/auto/testlib/selftests/sleep/sleep.pro
+++ b/tests/auto/testlib/selftests/sleep/sleep.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = sleep
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/strcmp/strcmp.pro b/tests/auto/testlib/selftests/strcmp/strcmp.pro
index ac1f1e8..5f3a9a2 100644 (file)
--- a/tests/auto/testlib/selftests/strcmp/strcmp.pro
+++ b/tests/auto/testlib/selftests/strcmp/strcmp.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = strcmp
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/subtest/subtest.pro b/tests/auto/testlib/selftests/subtest/subtest.pro
index 3066f20..23786f5 100644 (file)
--- a/tests/auto/testlib/selftests/subtest/subtest.pro
+++ b/tests/auto/testlib/selftests/subtest/subtest.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = subtest
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/warnings/warnings.pro b/tests/auto/testlib/selftests/warnings/warnings.pro
index 0c6ca01..061d2a1 100644 (file)
--- a/tests/auto/testlib/selftests/warnings/warnings.pro
+++ b/tests/auto/testlib/selftests/warnings/warnings.pro
@@ -4,5 +4,9 @@ QT = core testlib
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
-
 TARGET = warnings
+
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+

diff --git a/tests/auto/testlib/selftests/xunit/xunit.pro b/tests/auto/testlib/selftests/xunit/xunit.pro
index d3ae402..dc4f30c 100644 (file)
--- a/tests/auto/testlib/selftests/xunit/xunit.pro
+++ b/tests/auto/testlib/selftests/xunit/xunit.pro
@@ -1,8 +1,13 @@
 QT = core testlib
-SOURCES  += tst_xunit.cpp
+SOURCES += tst_xunit.cpp
+
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
 
 TARGET = xunit
 
+# This app is testdata for tst_selftests
+target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
+INSTALLS += target
+