diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-03-18 12:48:13 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-03-19 21:06:43 +0000 |
| commit | 90c4bcf047d85e633863d0fd5f5482b0a82a2295 (patch) | |
| tree | 14d9126555bafe1ef1d07a30e8373f2bf9f041f6 /tests | |
| parent | eb445a7f26ab93b27f5bbc7cc2d3e42739b2af28 (diff) | |
| download | qbs-90c4bcf047d85e633863d0fd5f5482b0a82a2295.tar.gz | |
Fix trackExternalProductChanges test
The parameter 'qbs' of filesFromFs was unused, and filesFromFs used the
magic variable 'path' which is only accidentally available in .js files.
Change-Id: I7804aae3207cfcb300d658e9c634fae8e421d4b2
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js b/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js index c3dfe2b11..159a7d32a 100644 --- a/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js +++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js @@ -1,4 +1,4 @@ function fileList() { return []; } -function filesFromFs(qbs) { return File.exists(path + "/fileExists.cpp") ? ["fileExists.cpp"] : []; } +function filesFromFs(path) { 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 05060acd7..e99d6b350 100644 --- a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs +++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs @@ -6,7 +6,7 @@ import "fileList.js" as FileList CppApplication { property stringList filesFromEnv: Environment.getEnv("QBS_TEST_PULL_IN_FILE_VIA_ENV") ? ["environmentChange.cpp"] : [] - files: ["main.cpp"].concat(FileList.fileList()).concat(filesFromEnv).concat(FileList.filesFromFs(qbs)) + files: ["main.cpp"].concat(FileList.fileList()).concat(filesFromEnv).concat(FileList.filesFromFs(path)) Group { condition: Environment.getEnv("INCLUDE_PATH_TEST") |