From b1945604a78626ed25ad8afe70a64c2eac76a2b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 9 Mar 2018 13:10:22 +0100 Subject: testlib selftest: Resolve expected files at qmake time Instead of keeping a static list in a qrc file. Change-Id: I7783db5cad5929cc3f449889e1cbcbb87f7f2637 Reviewed-by: Simon Hausmann --- tests/auto/testlib/selftests/selftests.qrc | 220 ----------------------------- tests/auto/testlib/selftests/test/test.pro | 4 +- 2 files changed, 3 insertions(+), 221 deletions(-) delete mode 100644 tests/auto/testlib/selftests/selftests.qrc diff --git a/tests/auto/testlib/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc deleted file mode 100644 index 63d3f42187..0000000000 --- a/tests/auto/testlib/selftests/selftests.qrc +++ /dev/null @@ -1,220 +0,0 @@ - - - expected_assert.lightxml - expected_assert.teamcity - expected_assert.txt - expected_assert.xml - expected_assert.xunitxml - expected_badxml.lightxml - expected_badxml.teamcity - expected_badxml.txt - expected_badxml.xml - expected_badxml.xunitxml - expected_benchlibcallgrind_0.txt - expected_benchlibcallgrind_1.txt - expected_benchlibcallgrind.csv - expected_benchlibcallgrind.lightxml - expected_benchlibcallgrind.xml - expected_benchlibcallgrind.xunitxml - expected_benchlibcounting.csv - expected_benchlibcounting.lightxml - expected_benchlibcounting.txt - expected_benchlibcounting.xml - expected_benchlibcounting.xunitxml - expected_benchlibeventcounter.csv - expected_benchlibeventcounter.lightxml - expected_benchlibeventcounter.txt - expected_benchlibeventcounter.xml - expected_benchlibeventcounter.xunitxml - expected_benchliboptions.lightxml - expected_benchliboptions.txt - expected_benchliboptions.xml - expected_benchliboptions.xunitxml - expected_benchlibtickcounter.csv - expected_benchlibtickcounter.lightxml - expected_benchlibtickcounter.txt - expected_benchlibtickcounter.xml - expected_benchlibtickcounter.xunitxml - expected_benchlibwalltime.csv - expected_benchlibwalltime.lightxml - expected_benchlibwalltime.txt - expected_benchlibwalltime.xml - expected_benchlibwalltime.xunitxml - expected_blacklisted.lightxml - expected_blacklisted.txt - expected_blacklisted.xml - expected_blacklisted.xunitxml - expected_cmptest.lightxml - expected_cmptest.teamcity - expected_cmptest.txt - expected_cmptest.xml - expected_cmptest.xunitxml - expected_commandlinedata.lightxml - expected_commandlinedata.teamcity - expected_commandlinedata.txt - expected_commandlinedata.xml - expected_commandlinedata.xunitxml - expected_counting.lightxml - expected_counting.teamcity - expected_counting.txt - expected_counting.xml - expected_counting.xunitxml - expected_crashes_1.txt - expected_crashes_2.txt - expected_crashes_3.txt - expected_crashes_4.txt - expected_datatable.lightxml - expected_datatable.teamcity - expected_datatable.txt - expected_datatable.xml - expected_datatable.xunitxml - expected_datetime.lightxml - expected_datetime.teamcity - expected_datetime.txt - expected_datetime.xml - expected_datetime.xunitxml - expected_differentexec.lightxml - expected_differentexec.txt - expected_differentexec.xml - expected_differentexec.xunitxml - expected_exceptionthrow.lightxml - expected_exceptionthrow.teamcity - expected_exceptionthrow.txt - expected_exceptionthrow.xml - expected_exceptionthrow.xunitxml - expected_expectfail.lightxml - expected_expectfail.teamcity - expected_expectfail.txt - expected_expectfail.xml - expected_expectfail.xunitxml - expected_failcleanup.lightxml - expected_failcleanup.teamcity - expected_failcleanup.txt - expected_failcleanup.xml - expected_failcleanup.xunitxml - expected_failinit.lightxml - expected_failinit.teamcity - expected_failinit.txt - expected_failinit.xml - expected_failinit.xunitxml - expected_failinitdata.lightxml - expected_failinitdata.teamcity - expected_failinitdata.txt - expected_failinitdata.xml - expected_failinitdata.xunitxml - expected_fetchbogus.lightxml - expected_fetchbogus.teamcity - expected_fetchbogus.txt - expected_fetchbogus.xml - expected_fetchbogus.xunitxml - expected_findtestdata.lightxml - expected_findtestdata.teamcity - expected_findtestdata.txt - expected_findtestdata.xml - expected_findtestdata.xunitxml - expected_float.lightxml - expected_float.txt - expected_float.xml - expected_float.xunitxml - expected_globaldata.lightxml - expected_globaldata.teamcity - expected_globaldata.txt - expected_globaldata.xml - expected_globaldata.xunitxml - expected_longstring.lightxml - expected_longstring.teamcity - expected_longstring.txt - expected_longstring.xml - expected_longstring.xunitxml - expected_maxwarnings.lightxml - expected_maxwarnings.teamcity - expected_maxwarnings.txt - expected_maxwarnings.xml - expected_maxwarnings.xunitxml - expected_multiexec.lightxml - expected_multiexec.txt - expected_multiexec.xml - expected_multiexec.xunitxml - expected_pairdiagnostics.lightxml - expected_pairdiagnostics.teamcity - expected_pairdiagnostics.txt - expected_pairdiagnostics.xml - expected_pairdiagnostics.xunitxml - expected_printdatatags.txt - expected_printdatatagswithglobaltags.txt - expected_qexecstringlist.lightxml - expected_qexecstringlist.txt - expected_qexecstringlist.xml - expected_qexecstringlist.xunitxml - expected_silent.lightxml - expected_silent.teamcity - expected_silent.txt - expected_silent.xml - expected_silent.xunitxml - expected_singleskip.lightxml - expected_singleskip.teamcity - expected_singleskip.txt - expected_singleskip.xml - expected_singleskip.xunitxml - expected_skip.lightxml - expected_skip.teamcity - expected_skip.txt - expected_skip.xml - expected_skip.xunitxml - expected_skipcleanup.lightxml - expected_skipcleanup.teamcity - expected_skipcleanup.txt - expected_skipcleanup.xml - expected_skipcleanup.xunitxml - expected_skipinit.lightxml - expected_skipinit.txt - expected_skipinit.teamcity - expected_skipinit.xml - expected_skipinit.xunitxml - expected_skipinitdata.lightxml - expected_skipinitdata.teamcity - expected_skipinitdata.txt - expected_skipinitdata.xml - expected_skipinitdata.xunitxml - expected_sleep.lightxml - expected_sleep.teamcity - expected_sleep.txt - expected_sleep.xml - expected_sleep.xunitxml - expected_strcmp.lightxml - expected_strcmp.teamcity - expected_strcmp.txt - expected_strcmp.xml - expected_strcmp.xunitxml - expected_subtest.lightxml - expected_subtest.txt - expected_subtest.teamcity - expected_subtest.xml - expected_subtest.xunitxml - expected_verbose1.lightxml - expected_verbose1.teamcity - expected_verbose1.txt - expected_verbose1.xml - expected_verbose1.xunitxml - expected_verbose2.lightxml - expected_verbose2.teamcity - expected_verbose2.txt - expected_verbose2.xml - expected_verbose2.xunitxml - expected_verifyexceptionthrown.lightxml - expected_verifyexceptionthrown.teamcity - expected_verifyexceptionthrown.txt - expected_verifyexceptionthrown.xml - expected_verifyexceptionthrown.xunitxml - expected_warnings.lightxml - expected_warnings.teamcity - expected_warnings.txt - expected_warnings.xml - expected_warnings.xunitxml - expected_xunit.lightxml - expected_xunit.teamcity - expected_xunit.txt - expected_xunit.xml - expected_xunit.xunitxml - - diff --git a/tests/auto/testlib/selftests/test/test.pro b/tests/auto/testlib/selftests/test/test.pro index a7487736b3..a348ea9ad5 100644 --- a/tests/auto/testlib/selftests/test/test.pro +++ b/tests/auto/testlib/selftests/test/test.pro @@ -12,7 +12,9 @@ win32 { } } -RESOURCES += ../selftests.qrc +expected_files.files = $$files($$PWD/../expected_*) +expected_files.base = $$PWD/.. +RESOURCES += expected_files include(../selftests.pri) !winrt: for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}" -- cgit v1.2.3