diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-03-06 21:21:08 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-05-07 11:50:33 +0000 |
| commit | d5e655f388dba4ffc139e9220722f3ee06d58b07 (patch) | |
| tree | ee5e115f3ee3a2e7f41720ff70f77edd8547b7b6 /mkspecs/features/testcase.prf | |
| parent | 97d7a00989f8d5df15eb68d90c1af547b67b3fa4 (diff) | |
fix handling of GENERATED_TESTDATA with CONFIG+=builtin_testdata
relative paths must be resolved against $$OUT_PWD, not $$_PRO_FILE_PWD_.
Task-number: QTBUG-58991
Change-Id: I9ce8e9c78e0fad026a7cc355852d23f9d6e96ee6
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs/features/testcase.prf')
| -rw-r--r-- | mkspecs/features/testcase.prf | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 3bbaf4575a..9179470986 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -195,20 +195,26 @@ isEmpty(BUILDS)|build_pass { } builtin_testdata { - ALL_TESTDATA = $$TESTDATA $$GENERATED_TESTDATA - - # BLACKLIST needs to be added to the testdata - BLACKLISTPATH = $$_PRO_FILE_PWD_/BLACKLIST - exists($$BLACKLISTPATH): ALL_TESTDATA *= $$BLACKLISTPATH - # RESOURCES does not support wildcards (for good reasons) - for(td, ALL_TESTDATA): \ + for (td, TESTDATA): \ testdata.files += $$files($$absolute_path($$td, $$_PRO_FILE_PWD_)) + # BLACKLIST needs to be added to the testdata + BLACKLISTPATH = $$_PRO_FILE_PWD_/BLACKLIST + exists($$BLACKLISTPATH): \ + testdata.files *= $$BLACKLISTPATH !isEmpty(testdata.files) { testdata.base = $$_PRO_FILE_PWD_ RESOURCES += testdata } + # Extra compilers don't create wildcards to start with. + for (td, GENERATED_TESTDATA): \ + gentestdata.files += $$absolute_path($$td, $$OUT_PWD) + !isEmpty(gentestdata.files) { + gentestdata.base = $$OUT_PWD + RESOURCES += gentestdata + } + !isEmpty(TEST_HELPER_INSTALLS): \ error("This platform does not support tests which require helpers.") } |