aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata/propertyChanges
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2016-11-29 16:34:45 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2016-11-30 14:23:12 +0000
commitd4540126185efe4a8017280a0e1d1481a33c44cc (patch)
tree25484997f06088ffecd4a8f0239c41e49abc1f07 /tests/auto/blackbox/testdata/propertyChanges
parent80e193df5591eadeef01bf5cd7f3685916ad660e (diff)
Fix change tracking for module properties requested from artifacts
... in commands. For some strange reason, this particular case was missing. Task-number: QBS-1049 Change-Id: I2ceb000ef5b362754f9fcbccd44b3e3c3e396e46 Reviewed-by: Denis Klychkov <kd.snake@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/propertyChanges')
-rw-r--r--tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs7
-rw-r--r--tests/auto/blackbox/testdata/propertyChanges/project.qbs1
-rw-r--r--tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs5
3 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
index bac717dc6..4bdd5c7fe 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
@@ -7,6 +7,8 @@ Module {
fileTags: "test-input"
}
+ property string testProperty
+
Rule {
inputs: ['test-input']
Artifact {
@@ -19,8 +21,9 @@ Module {
cmd.highlight = "codegen";
cmd.description = "Making output from input";
cmd.sourceCode = function() {
- // console.info('Change in source code');
- File.copy(input.filePath, output.filePath);
+ // console.info('Change in source code');
+ console.info(input.moduleProperty("TestModule", "testProperty"));
+ File.copy(input.filePath, output.filePath);
}
return cmd;
}
diff --git a/tests/auto/blackbox/testdata/propertyChanges/project.qbs b/tests/auto/blackbox/testdata/propertyChanges/project.qbs
index 8293d4ca7..a2b42a626 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/project.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/project.qbs
@@ -6,6 +6,7 @@ import qbs.TextFile
Project {
property var projectDefines: ["blubb2"]
property string fileContentSuffix: "suffix 1"
+ property string testProperty: "default value"
CppApplication {
name: qbs.enableDebugCode ? "product 1.debug" : "product 1.release"
cpp.defines: ["blubb1"]
diff --git a/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs b/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs
index b367e07fc..21d6f75ef 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs
@@ -4,5 +4,8 @@ Product {
name: "ruletest"
type: "test-output"
Depends { name: "TestModule" }
- files: "test.in"
+ Group {
+ files: "test.in"
+ TestModule.testProperty: project.testProperty
+ }
}