AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix handling of GENERATED_TESTDATA with CONFIG+=builtin_testdata

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2017-03-06 21:21:08 +01:00
parent 97d7a00989
commit d5e655f388
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mkspecs/features/testcase.prf
View File

@ -195,20 +195,26 @@ isEmpty(BUILDS)|build_pass {
}
builtin_testdata {
ALL_TESTDATA = $$TESTDATA $$GENERATED_TESTDATA
# RESOURCES does not support wildcards (for good reasons)
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): ALL_TESTDATA *= $$BLACKLISTPATH
# RESOURCES does not support wildcards (for good reasons)
for(td, ALL_TESTDATA): \
testdata.files += $$files($$absolute_path($$td, $$_PRO_FILE_PWD_))
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.")
}