diff options
Diffstat (limited to 'tests')
37 files changed, 15 insertions, 177 deletions
diff --git a/tests/auto/testlib/selftests/assert/assert.pro b/tests/auto/testlib/selftests/assert/assert.pro index fcde0384e4..cfc6a0c6b3 100644 --- a/tests/auto/testlib/selftests/assert/assert.pro +++ b/tests/auto/testlib/selftests/assert/assert.pro @@ -5,8 +5,3 @@ 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 89ae8eeeef..5eaa1c3216 100644 --- a/tests/auto/testlib/selftests/badxml/badxml.pro +++ b/tests/auto/testlib/selftests/badxml/badxml.pro @@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle 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 58329d6c14..6cbefe518c 100644 --- a/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro +++ b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro @@ -5,8 +5,3 @@ 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 d5363eb54c..5e2b963491 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro +++ b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro @@ -5,8 +5,3 @@ 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 df1bf2b64c..f4bcc92129 100644 --- a/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro +++ b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro @@ -5,8 +5,3 @@ 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 1da4646023..a793c203dd 100644 --- a/tests/auto/testlib/selftests/cmptest/cmptest.pro +++ b/tests/auto/testlib/selftests/cmptest/cmptest.pro @@ -5,8 +5,3 @@ 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 705da2fc2e..056388333a 100644 --- a/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro +++ b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro @@ -5,8 +5,3 @@ 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 d9011bae5d..25e24243d1 100644 --- a/tests/auto/testlib/selftests/crashes/crashes.pro +++ b/tests/auto/testlib/selftests/crashes/crashes.pro @@ -5,8 +5,3 @@ 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 ab01b60627..72fa851ae6 100644 --- a/tests/auto/testlib/selftests/datatable/datatable.pro +++ b/tests/auto/testlib/selftests/datatable/datatable.pro @@ -5,8 +5,3 @@ 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 c0efbc2c6e..d65c59354f 100644 --- a/tests/auto/testlib/selftests/datetime/datetime.pro +++ b/tests/auto/testlib/selftests/datetime/datetime.pro @@ -5,8 +5,3 @@ 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 d3ca2a2064..7f148ba996 100644 --- a/tests/auto/testlib/selftests/differentexec/differentexec.pro +++ b/tests/auto/testlib/selftests/differentexec/differentexec.pro @@ -5,8 +5,3 @@ 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 8e1bff4b93..6b8c821e6e 100644 --- a/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro +++ b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro @@ -5,8 +5,3 @@ 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 c08ff868bc..c1849990f2 100644 --- a/tests/auto/testlib/selftests/expectfail/expectfail.pro +++ b/tests/auto/testlib/selftests/expectfail/expectfail.pro @@ -5,8 +5,3 @@ 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 4b292b5b3b..6a30a5af68 100644 --- a/tests/auto/testlib/selftests/failinit/failinit.pro +++ b/tests/auto/testlib/selftests/failinit/failinit.pro @@ -5,8 +5,3 @@ 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 a3cbed2afc..b608c67dbb 100644 --- a/tests/auto/testlib/selftests/failinitdata/failinitdata.pro +++ b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro @@ -5,8 +5,3 @@ 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 013eaaf780..33b306ca75 100644 --- a/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro +++ b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro @@ -5,8 +5,3 @@ 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 ff349987ba..f04a640c59 100644 --- a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro +++ b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro @@ -7,8 +7,3 @@ 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 5b4376e760..95980eeac8 100644 --- a/tests/auto/testlib/selftests/float/float.pro +++ b/tests/auto/testlib/selftests/float/float.pro @@ -5,8 +5,3 @@ 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 240dd51b96..c0b1554c0f 100644 --- a/tests/auto/testlib/selftests/globaldata/globaldata.pro +++ b/tests/auto/testlib/selftests/globaldata/globaldata.pro @@ -5,8 +5,3 @@ 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 0b311bd019..d16ba85095 100644 --- a/tests/auto/testlib/selftests/longstring/longstring.pro +++ b/tests/auto/testlib/selftests/longstring/longstring.pro @@ -5,8 +5,3 @@ 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 e93d1610af..79451af1ec 100644 --- a/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro +++ b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro @@ -5,8 +5,3 @@ 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 8886531417..2038acbd31 100644 --- a/tests/auto/testlib/selftests/multiexec/multiexec.pro +++ b/tests/auto/testlib/selftests/multiexec/multiexec.pro @@ -5,8 +5,3 @@ 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 80acde22dd..cd06384835 100644 --- a/tests/auto/testlib/selftests/printdatatags/printdatatags.pro +++ b/tests/auto/testlib/selftests/printdatatags/printdatatags.pro @@ -5,8 +5,3 @@ 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 86cfa0974d..f1cf25d104 100644 --- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro +++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro @@ -5,8 +5,3 @@ 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 15fd236aa5..bd967f32e6 100644 --- a/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro +++ b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro @@ -5,8 +5,3 @@ 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/selftests.pri b/tests/auto/testlib/selftests/selftests.pri new file mode 100644 index 0000000000..f506c8c08c --- /dev/null +++ b/tests/auto/testlib/selftests/selftests.pri @@ -0,0 +1,7 @@ +SUBPROGRAMS = subtest warnings maxwarnings cmptest globaldata skip \ + strcmp expectfail sleep fetchbogus crashes multiexec failinit failinitdata \ + skipinit skipinitdata datetime singleskip assert differentexec \ + exceptionthrow qexecstringlist datatable commandlinedata\ + benchlibwalltime benchlibcallgrind benchlibeventcounter benchlibtickcounter \ + benchliboptions xunit badxml longstring float printdatatags \ + printdatatagswithglobaltags findtestdata diff --git a/tests/auto/testlib/selftests/selftests.pro b/tests/auto/testlib/selftests/selftests.pro index 68239754aa..1d39e6a899 100644 --- a/tests/auto/testlib/selftests/selftests.pro +++ b/tests/auto/testlib/selftests/selftests.pro @@ -1,12 +1,8 @@ TEMPLATE = subdirs -SUBDIRS = subtest test warnings maxwarnings cmptest globaldata skip \ - strcmp expectfail sleep fetchbogus crashes multiexec failinit failinitdata \ - skipinit skipinitdata datetime singleskip assert differentexec \ - exceptionthrow qexecstringlist datatable commandlinedata\ - benchlibwalltime benchlibcallgrind benchlibeventcounter benchlibtickcounter \ - benchliboptions xunit badxml longstring float printdatatags \ - printdatatagswithglobaltags findtestdata +include(selftests.pri) + +SUBDIRS = $$SUBPROGRAMS test INSTALLS = diff --git a/tests/auto/testlib/selftests/singleskip/singleskip.pro b/tests/auto/testlib/selftests/singleskip/singleskip.pro index f0f51a5fc3..9f63e62747 100644 --- a/tests/auto/testlib/selftests/singleskip/singleskip.pro +++ b/tests/auto/testlib/selftests/singleskip/singleskip.pro @@ -5,8 +5,3 @@ 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 65b41b9c3d..8780d295cf 100644 --- a/tests/auto/testlib/selftests/skip/skip.pro +++ b/tests/auto/testlib/selftests/skip/skip.pro @@ -5,8 +5,3 @@ 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 acd6a41049..7defce9a52 100644 --- a/tests/auto/testlib/selftests/skipinit/skipinit.pro +++ b/tests/auto/testlib/selftests/skipinit/skipinit.pro @@ -5,8 +5,3 @@ 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 e3dc586dee..cd806c2a43 100644 --- a/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro +++ b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro @@ -5,8 +5,3 @@ 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 4ff843a4e7..affcba22ee 100644 --- a/tests/auto/testlib/selftests/sleep/sleep.pro +++ b/tests/auto/testlib/selftests/sleep/sleep.pro @@ -5,8 +5,3 @@ 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 5f3a9a2c10..f5f6eecc88 100644 --- a/tests/auto/testlib/selftests/strcmp/strcmp.pro +++ b/tests/auto/testlib/selftests/strcmp/strcmp.pro @@ -5,8 +5,3 @@ 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 23786f5b19..09dee1b1b9 100644 --- a/tests/auto/testlib/selftests/subtest/subtest.pro +++ b/tests/auto/testlib/selftests/subtest/subtest.pro @@ -5,8 +5,3 @@ 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/test/test.pro b/tests/auto/testlib/selftests/test/test.pro index 29d2cc5f36..a395ecea47 100644 --- a/tests/auto/testlib/selftests/test/test.pro +++ b/tests/auto/testlib/selftests/test/test.pro @@ -13,3 +13,8 @@ win32 { } RESOURCES += ../selftests.qrc + +include(../selftests.pri) +load(testcase) # for target.path and installTestHelperApp() +for(file, SUBPROGRAMS): installTestHelperApp("../$${file}/$${file}",$${file},$${file}) + diff --git a/tests/auto/testlib/selftests/warnings/warnings.pro b/tests/auto/testlib/selftests/warnings/warnings.pro index 061d2a1055..0c6cddcefb 100644 --- a/tests/auto/testlib/selftests/warnings/warnings.pro +++ b/tests/auto/testlib/selftests/warnings/warnings.pro @@ -5,8 +5,3 @@ 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 dc4f30c3e2..b8c606e828 100644 --- a/tests/auto/testlib/selftests/xunit/xunit.pro +++ b/tests/auto/testlib/selftests/xunit/xunit.pro @@ -6,8 +6,3 @@ 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 - |