diff options
Diffstat (limited to 'tests/auto/blackbox/testdata')
3 files changed, 11 insertions, 5 deletions
diff --git a/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs b/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs index 106ccdf54..81562a70b 100644 --- a/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs +++ b/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs @@ -4,7 +4,11 @@ Application { name: "installedApp" type: "application" Depends { name: "cpp" } - files: "main.cpp" + Group { + files: "main.cpp" + qbs.install: true + qbs.installDir: "src" + } qbs.installPrefix: "/usr" Group { fileTagsFilter: "application" diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js b/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js index 0d540d82e..d5c40cde1 100644 --- a/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js +++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js @@ -1 +1,6 @@ function fileList() { return []; } + +function filesFromEnv(qbs) { return qbs.getenv("QBS_TEST_PULL_IN_FILE_VIA_ENV") ? ["environmentChange.cpp"] : []; } + +function filesFromFs(qbs) { return File.exists(path + "/fileExists.cpp") ? ["fileExists.cpp"] : []; } + diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs b/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs index 8ed267fa5..c3eb9b0b7 100644 --- a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs +++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs @@ -3,8 +3,5 @@ import qbs.File import "fileList.js" as FileList CppApplication { - property pathList filesFromEnv: qbs.getenv("QBS_TEST_PULL_IN_FILE_VIA_ENV") ? ["environmentChange.cpp"] : [] - property pathList filesFromJs: FileList.fileList() - property pathList filesFromFs: File.exists(path + "/fileExists.cpp") ? ["fileExists.cpp"] : [] - files: ["main.cpp"].concat(filesFromJs).concat(filesFromEnv).concat(filesFromFs) + files: ["main.cpp"].concat(FileList.fileList()).concat(FileList.filesFromEnv(qbs)).concat(FileList.filesFromFs(qbs)) } |