diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-26 14:56:38 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-26 17:51:38 +0100 |
| commit | 78fa3cbf4ffdc1c7469e471e6b0349b3b5a14931 (patch) | |
| tree | 391d366e9b5ededa29cd20535f69c9f74b8c8b2c /tests/auto/blackbox | |
| parent | 3db9811427b737d7f116578ead054d18876c93db (diff) | |
Do not share product properties with artifacts.
Since products potentially share their property maps with their groups,
artifacts get product properties such as "name" and
"destinationDirectory". This is strange and can mess with change
tracking. Therefore we split up the product's property map in two: One
contains the module properties and is potentially shared with groups,
the other has the actual product properties and is not shared.
This patch also removes a workaround from an autotest that was required
until now to prevent a false positive in change tracking.
Change-Id: Ia1f1f0ce32669fd893a99f809753df526bf1442a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto/blackbox')
| -rw-r--r-- | tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js b/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js index 5174f8ce7..c3dfe2b11 100644 --- a/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js +++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/fileList.js @@ -1,6 +1,4 @@ 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 c3eb9b0b7..df1ddc1f9 100644 --- a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs +++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs @@ -3,5 +3,7 @@ import qbs.File import "fileList.js" as FileList CppApplication { - files: ["main.cpp"].concat(FileList.fileList()).concat(FileList.filesFromEnv(qbs)).concat(FileList.filesFromFs(qbs)) + property stringList filesFromEnv: qbs.getEnv("QBS_TEST_PULL_IN_FILE_VIA_ENV") + ? ["environmentChange.cpp"] : [] + files: ["main.cpp"].concat(FileList.fileList()).concat(filesFromEnv).concat(FileList.filesFromFs(qbs)) } |