aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2021-11-04 20:56:28 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2021-11-15 18:56:24 +0000
commitc1af290c995ef9791731fa59fdb7d24443c6b035 (patch)
tree7ce3fb0dde92f0dba9be9c38a69b8468eb6f63ab /tests/auto
parentce6ee7bb701b3a88088b38efd9297e5ced31aadd (diff)
Fix descriptions for JS commands
* All descriptions start with a small letter. * Trailing dots have been removed from all descriptions. * For all static library rules replaced 'linking' with 'creating' in descriptions. * Added 'ing' ending to all descriptions where it was missing. Change-Id: I2a4cb9dd53980d33628e097efaae53a68573af42 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/api/testdata/codegen/codegen.qbs2
-rw-r--r--tests/auto/api/testdata/infinite-loop-js/infinite-loop.qbs2
-rw-r--r--tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs2
-rw-r--r--tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs2
-rw-r--r--tests/auto/api/testdata/process-result/process-result.qbs2
-rw-r--r--tests/auto/api/testdata/timeout-js/timeout.qbs2
-rw-r--r--tests/auto/api/testdata/timeout-process/timeout.qbs2
-rw-r--r--tests/auto/api/testdata/transformer-data/transformer-data.qbs4
-rw-r--r--tests/auto/api/testdata/two-default-property-values/modules/mymodule/mymodule.qbs2
-rw-r--r--tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs2
-rw-r--r--tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs2
-rw-r--r--tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs2
-rw-r--r--tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs4
-rw-r--r--tests/auto/blackbox/testdata/export-rule/export-rule.qbs2
-rw-r--r--tests/auto/blackbox/testdata/exports-qbs/tool.qbs2
-rw-r--r--tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs2
-rw-r--r--tests/auto/blackbox/testdata/importing-product/importing-product.qbs2
-rw-r--r--tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs2
-rw-r--r--tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs4
-rw-r--r--tests/auto/blackbox/testdata/installable/installable.qbs2
-rw-r--r--tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs2
-rw-r--r--tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs2
-rw-r--r--tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs2
-rw-r--r--tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs2
-rw-r--r--tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs2
-rw-r--r--tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs2
-rw-r--r--tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs2
-rw-r--r--tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs2
-rw-r--r--tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs2
-rw-r--r--tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs2
-rw-r--r--tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs2
-rw-r--r--tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs2
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp134
-rw-r--r--tests/auto/blackbox/tst_blackboxandroid.cpp2
-rw-r--r--tests/auto/blackbox/tst_blackboxjoblimits.cpp2
35 files changed, 104 insertions, 104 deletions
diff --git a/tests/auto/api/testdata/codegen/codegen.qbs b/tests/auto/api/testdata/codegen/codegen.qbs
index d8a217572..29c7818c4 100644
--- a/tests/auto/api/testdata/codegen/codegen.qbs
+++ b/tests/auto/api/testdata/codegen/codegen.qbs
@@ -65,7 +65,7 @@ Project {
args[0] = args[0].replace(/;/g, '\\;')
cmd = new Command(product.qbs.shellPath, ['-c'].concat(args))
}
- cmd.description = 'generate\t' + FileInfo.fileName(output.filePath);
+ cmd.description = 'generating ' + FileInfo.fileName(output.filePath);
cmd.highlight = 'codegen';
return cmd;
}
diff --git a/tests/auto/api/testdata/infinite-loop-js/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-js/infinite-loop.qbs
index bb616a9e2..224e90ca6 100644
--- a/tests/auto/api/testdata/infinite-loop-js/infinite-loop.qbs
+++ b/tests/auto/api/testdata/infinite-loop-js/infinite-loop.qbs
@@ -8,7 +8,7 @@ Product {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Running infinite loop";
+ cmd.description = "running infinite loop";
cmd.sourceCode = function() {
while (true)
;
diff --git a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
index f4ea8bf83..f100e4d37 100644
--- a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
+++ b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
@@ -24,7 +24,7 @@ Project {
outputFileTags: "mytype"
prepare: {
var cmd = new Command(inputs["application"][0].filePath);
- cmd.description = "Calling application that runs forever";
+ cmd.description = "calling application that runs forever";
return cmd;
}
}
diff --git a/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs b/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs
index 2fd58d24e..1b0728669 100644
--- a/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs
+++ b/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs
@@ -21,7 +21,7 @@ CppApplication {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Generating " + output.fileName;
+ cmd.description = "generating " + output.fileName;
cmd.sourceCode = function() { File.copy(input.filePath, output.filePath); }
return [cmd];
}
diff --git a/tests/auto/api/testdata/process-result/process-result.qbs b/tests/auto/api/testdata/process-result/process-result.qbs
index 5b71ecaaa..069edb4c0 100644
--- a/tests/auto/api/testdata/process-result/process-result.qbs
+++ b/tests/auto/api/testdata/process-result/process-result.qbs
@@ -27,7 +27,7 @@ Project {
cmd.stdoutFilePath = product.buildDirectory + "/stdout.txt";
if (product.redirectStderr)
cmd.stderrFilePath = product.buildDirectory + "/stderr.txt";
- cmd.description = "Building app-caller";
+ cmd.description = "building app-caller";
return [cmd];
}
}
diff --git a/tests/auto/api/testdata/timeout-js/timeout.qbs b/tests/auto/api/testdata/timeout-js/timeout.qbs
index 26aa4ce87..72c72573b 100644
--- a/tests/auto/api/testdata/timeout-js/timeout.qbs
+++ b/tests/auto/api/testdata/timeout-js/timeout.qbs
@@ -8,7 +8,7 @@ Product {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Running infinite loop";
+ cmd.description = "running infinite loop";
cmd.sourceCode = function() {
while (true)
;
diff --git a/tests/auto/api/testdata/timeout-process/timeout.qbs b/tests/auto/api/testdata/timeout-process/timeout.qbs
index 30f390946..994050309 100644
--- a/tests/auto/api/testdata/timeout-process/timeout.qbs
+++ b/tests/auto/api/testdata/timeout-process/timeout.qbs
@@ -31,7 +31,7 @@ Project {
outputFileTags: "product-under-test"
prepare: {
var cmd = new Command(inputs["application"][0].filePath);
- cmd.description = "Calling application that runs forever";
+ cmd.description = "calling application that runs forever";
cmd.timeout = 3;
return cmd;
}
diff --git a/tests/auto/api/testdata/transformer-data/transformer-data.qbs b/tests/auto/api/testdata/transformer-data/transformer-data.qbs
index f9433ed73..d29dbdbae 100644
--- a/tests/auto/api/testdata/transformer-data/transformer-data.qbs
+++ b/tests/auto/api/testdata/transformer-data/transformer-data.qbs
@@ -11,7 +11,7 @@ Product {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating " + output.fileName;
+ cmd.description = "creating " + output.fileName;
cmd.sourceCode = function() {
var f = new TextFile(output.filePath, TextFile.WriteOnly);
f.close();
@@ -27,7 +27,7 @@ Product {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating " + output.fileName;
+ cmd.description = "creating " + output.fileName;
cmd.sourceCode = function() { File.copy(input.filePath, output.filePath); };
return [cmd];
}
diff --git a/tests/auto/api/testdata/two-default-property-values/modules/mymodule/mymodule.qbs b/tests/auto/api/testdata/two-default-property-values/modules/mymodule/mymodule.qbs
index 8ac7b75a3..67f34ed66 100644
--- a/tests/auto/api/testdata/two-default-property-values/modules/mymodule/mymodule.qbs
+++ b/tests/auto/api/testdata/two-default-property-values/modules/mymodule/mymodule.qbs
@@ -12,7 +12,7 @@ Module {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating " + output.fileName;
+ cmd.description = "creating " + output.fileName;
cmd.sourceCode = function() {
var f = new TextFile(output.filePath, TextFile.WriteOnly);
f.close();
diff --git a/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs b/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs
index 221105a64..c9f712a85 100644
--- a/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs
+++ b/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs
@@ -37,7 +37,7 @@ Project {
var cmd = new Command(explicitlyDependsOn.tool_tag[0].filePath,
[output.filePath]);
cmd.workingDirectory = product.buildDirectory;
- cmd.description = "Running tool";
+ cmd.description = "running tool";
cmd.jobPool = "singleton";
return cmd;
}
diff --git a/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs b/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs
index cf5354268..011eedc91 100644
--- a/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs
+++ b/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs
@@ -15,7 +15,7 @@ Product {
prepare: {
var cmd = new JavaScriptCommand();
PrepareHelper.prepare(cmd);
- cmd.description = "Creating output";
+ cmd.description = "creating output";
return [cmd];
}
}
diff --git a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs
index 735bfffbc..681ffeab0 100644
--- a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs
+++ b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs
@@ -18,7 +18,7 @@ Project {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = 'generate ' + FileInfo.fileName(output.filePath);
+ cmd.description = 'generating ' + FileInfo.fileName(output.filePath);
cmd.highlight = 'codegen';
cmd.sourceCode = function() {
file = new TextFile(output.filePath, TextFile.WriteOnly);
diff --git a/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs b/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs
index 3e1747ade..fd755ce86 100644
--- a/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs
+++ b/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs
@@ -10,7 +10,7 @@ Module {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating " + output.fileName + " with " + product.m.p1;
+ cmd.description = "creating " + output.fileName + " with " + product.m.p1;
cmd.sourceCode = function() {};
return [cmd];
}
@@ -24,7 +24,7 @@ Module {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating " + output.fileName + " with " + product.m.p2;
+ cmd.description = "creating " + output.fileName + " with " + product.m.p2;
cmd.sourceCode = function() {};
return [cmd];
}
diff --git a/tests/auto/blackbox/testdata/export-rule/export-rule.qbs b/tests/auto/blackbox/testdata/export-rule/export-rule.qbs
index 29899e728..455ccba0d 100644
--- a/tests/auto/blackbox/testdata/export-rule/export-rule.qbs
+++ b/tests/auto/blackbox/testdata/export-rule/export-rule.qbs
@@ -13,7 +13,7 @@ Project {
Export {
Depends { name: "cpp" }
property bool enableTagger
- property string description: "Creating C++ source file.";
+ property string description: "creating C++ source file.";
FileTagger {
condition: enableTagger
patterns: ["*.blubb"]
diff --git a/tests/auto/blackbox/testdata/exports-qbs/tool.qbs b/tests/auto/blackbox/testdata/exports-qbs/tool.qbs
index cea46d3fd..d3626bead 100644
--- a/tests/auto/blackbox/testdata/exports-qbs/tool.qbs
+++ b/tests/auto/blackbox/testdata/exports-qbs/tool.qbs
@@ -49,7 +49,7 @@ CppApplication {
prepare: {
var cmd = new Command(explicitlyDependsOn["MyTool.tool"][0].filePath,
[input.filePath, output.filePath]);
- cmd.description = input.fileName + " -> " + output.fileName;
+ cmd.description = "compiling" + input.fileName + " to " + output.fileName;
return [cmd];
}
}
diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs
index cbd30a35d..9dc903411 100644
--- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs
+++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs
@@ -39,7 +39,7 @@ Module {
prepare: {
var cmd = new Command(FileInfo.joinPaths(product.buildDirectory, product.targetName), [input.filePath, output.filePath]);
- cmd.description = "compile " + input.fileName + " => " + output.fileName;
+ cmd.description = "compiling " + input.fileName + " to " + output.fileName;
return [cmd];
}
}
diff --git a/tests/auto/blackbox/testdata/importing-product/importing-product.qbs b/tests/auto/blackbox/testdata/importing-product/importing-product.qbs
index dfc4cd65e..54ad727b7 100644
--- a/tests/auto/blackbox/testdata/importing-product/importing-product.qbs
+++ b/tests/auto/blackbox/testdata/importing-product/importing-product.qbs
@@ -16,7 +16,7 @@ Project {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Copying file";
+ cmd.description = "copying file";
cmd.sourceCode = function() {
File.copy(input.filePath, output.filePath);
}
diff --git a/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs b/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs
index 919060c73..f9993ecf3 100644
--- a/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs
+++ b/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs
@@ -37,7 +37,7 @@ Project {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Gathering text files";
+ cmd.description = "gathering text files";
cmd.sourceCode = function() {
for (i in inputs.txt)
console.info(inputs.txt[i].filePath);
diff --git a/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs b/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs
index c34b0ca74..a1c96bf3d 100644
--- a/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs
+++ b/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs
@@ -56,7 +56,7 @@ Project {
Artifact { filePath: "theheader.h.in"; fileTags: "header.in" }
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating " + output.fileName;
+ cmd.description = "creating " + output.fileName;
cmd.sourceCode = function() {
for (var i = 0; i < 1000; ++i) { // Artificial delay.
var file = new TextFile(output.filePath, TextFile.WriteOnly);
@@ -75,7 +75,7 @@ Project {
Artifact { filePath: "theheader.h"; fileTags: "header" }
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating " + output.fileName;
+ cmd.description = "creating " + output.fileName;
cmd.sourceCode = function() { File.copy(input.filePath, output.filePath); };
return [cmd];
}
diff --git a/tests/auto/blackbox/testdata/installable/installable.qbs b/tests/auto/blackbox/testdata/installable/installable.qbs
index 56feb6ec5..1973ec8f9 100644
--- a/tests/auto/blackbox/testdata/installable/installable.qbs
+++ b/tests/auto/blackbox/testdata/installable/installable.qbs
@@ -27,7 +27,7 @@ Project {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating " + output.fileName;
+ cmd.description = "creating " + output.fileName;
cmd.sourceCode = function() {
var file = new TextFile(output.filePath, TextFile.WriteOnly);
for (var i = 0; i < inputs.installable.length; ++i)
diff --git a/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs b/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs
index aa40b7691..6f84206be 100644
--- a/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs
+++ b/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs
@@ -18,7 +18,7 @@ Product {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating file:'" + output.fileName + "'";
+ cmd.description = "creating file:'" + output.fileName + "'";
cmd.highlight = "codegen";
cmd.sourceCode = function() {
var file = new TextFile(output.filePath, TextFile.WriteOnly);
diff --git a/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs b/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs
index b08fcd4a3..a07beda57 100644
--- a/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs
+++ b/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs
@@ -16,7 +16,7 @@ Product {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating output";
+ cmd.description = "creating output";
if (product.errorType === "qobject")
cmd.dummy = new TextFile(input.filePath, TextFile.ReadOnly);
else if (product.errorType === "input")
diff --git a/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs b/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs
index f8b6a7dc0..a5a6c7d4b 100644
--- a/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs
+++ b/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs
@@ -10,7 +10,7 @@ Module {
var cmd = new JavaScriptCommand();
cmd.sourceCode = function() { };
var prop = product.lowerlevel.prop;
- cmd.description = "lowerlevel.prop is '" + prop + "'.";
+ cmd.description = "lowerlevel.prop is '" + prop + "'";
return [cmd];
}
}
diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs
index 41c6cfe50..45b8e157f 100644
--- a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs
+++ b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs
@@ -7,7 +7,7 @@ Module {
outputFileTags: "dep-out"
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating dep-out artifact";
+ cmd.description = "creating dep-out artifact";
cmd.sourceCode = function() {
console.info("prop: " + product.depmodule.prop);
console.info("listProp: " + product.depmodule.listProp);
diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs
index 89d544f7e..31275aa40 100644
--- a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs
+++ b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs
@@ -13,7 +13,7 @@ Module {
outputFileTags: "out"
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating out artifact";
+ cmd.description = "creating out artifact";
cmd.sourceCode = function() {
console.info("found: " + product.mymodule.found);
};
diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
index 8fa761a2d..6772acf27 100644
--- a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
+++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
@@ -116,7 +116,7 @@ Project {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Collecting apps";
+ cmd.description = "collecting apps";
cmd.sourceCode = function() {
var file = new TextFile(output.filePath, TextFile.WriteOnly);
for (var i = 0; i < inputs["application"].length; ++i)
diff --git a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
index b1e4a1fdc..590736f6a 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
@@ -18,7 +18,7 @@ Module {
prepare: {
var cmd = new JavaScriptCommand();
cmd.highlight = "codegen";
- cmd.description = "Making output from input";
+ cmd.description = "making output from input";
cmd.sourceCode = function() {
// console.info('Change in source code');
console.info(input.TestModule.testProperty);
diff --git a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
index f13b1986e..0ae8c1550 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
@@ -80,7 +80,7 @@ Project {
prepare: {
var cmd = new JavaScriptCommand();
cmd.highlight = "codegen";
- cmd.description = "Making output from other output";
+ cmd.description = "making output from other output";
cmd.sourceCode = function() { File.copy(input.filePath, output.filePath); }
return cmd;
}
diff --git a/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs b/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs
index 4e9da01d3..4fc275877 100644
--- a/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs
+++ b/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs
@@ -23,7 +23,7 @@ Product {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating " + output.fileName;
+ cmd.description = "creating " + output.fileName;
cmd.sourceCode = function() {
var inputList = explicitlyDependsOn["txt.in"];
var fileNameList = [];
diff --git a/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs b/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs
index 1bd9beebf..9d861b674 100644
--- a/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs
+++ b/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs
@@ -22,7 +22,7 @@ Product {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Generating " + output.fileName;
+ cmd.description = "generating " + output.fileName;
cmd.sourceCode = function() {
var f = new TextFile(output.filePath, TextFile.WriteOnly);
f.write('(');
diff --git a/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs b/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs
index 77df81e39..c33e24d34 100644
--- a/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs
+++ b/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs
@@ -17,7 +17,7 @@ Project {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating output";
+ cmd.description = "creating output";
cmd.sourceCode = function() {
var f = new TextFile(output.filePath, TextFile.WriteOnly);
f.write(project.version);
diff --git a/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs b/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs
index f6662529d..fe6088943 100644
--- a/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs
+++ b/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs
@@ -22,7 +22,7 @@ Product {
}
prepare: {
var cmd = new JavaScriptCommand();
- cmd.description = "Creating output artifact";
+ cmd.description = "creating output artifact";
cmd.highlight = "codegen";
cmd.sourceCode = function() {
var file = new TextFile(output.filePath, TextFile.WriteOnly);
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index b37b1e81e..8c1f93ed0 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1001,7 +1001,7 @@ void TestBlackbox::dependenciesProperty()
REPLACE_IN_FILE(projectFile, "// Depends { name: 'newDependency' }",
"Depends { name: 'newDependency' }");
QCOMPARE(runQbs(), 0);
- QVERIFY2(m_qbsStdout.contains("generate product1.deps"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("generating product1.deps"), m_qbsStdout.constData());
readDepsOutput(depsFile, jsondoc);
dependencies = jsondoc.array();
QCOMPARE(dependencies.size(), 3);
@@ -1012,7 +1012,7 @@ void TestBlackbox::dependenciesProperty()
REPLACE_IN_FILE(projectFile, "// Depends { name: 'product2' }", "Depends { name: 'product2' }");
QCOMPARE(runQbs(), 0);
QVERIFY2(m_qbsStdout.contains("Resolving"), m_qbsStdout.constData());
- QVERIFY2(!m_qbsStdout.contains("generate product1.deps"), m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("generating product1.deps"), m_qbsStdout.constData());
readDepsOutput(depsFile, jsondoc);
dependencies = jsondoc.array();
QCOMPARE(dependencies.size(), 3);
@@ -1022,7 +1022,7 @@ void TestBlackbox::dependenciesProperty()
0);
QCOMPARE(runQbs(), 0);
QVERIFY2(!m_qbsStdout.contains("compiling product2.cpp"), m_qbsStdout.constData());
- QVERIFY2(m_qbsStdout.contains("generate product1.deps"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("generating product1.deps"), m_qbsStdout.constData());
readDepsOutput(depsFile, jsondoc);
dependencies = jsondoc.array();
QCOMPARE(dependencies.size(), 3);
@@ -1034,7 +1034,7 @@ void TestBlackbox::dependenciesProperty()
"products.product2.cpp.defines:DIGEDAG"})), 0);
QCOMPARE(runQbs(), 0);
QVERIFY2(m_qbsStdout.contains("compiling product2.cpp"), m_qbsStdout.constData());
- QVERIFY2(m_qbsStdout.contains("generate product1.deps"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("generating product1.deps"), m_qbsStdout.constData());
readDepsOutput(depsFile, jsondoc);
dependencies = jsondoc.array();
QCOMPARE(dependencies.size(), 3);
@@ -1103,16 +1103,16 @@ void TestBlackbox::disappearedProfile()
QbsRunParameters buildParams;
buildParams.profile.clear();
QCOMPARE(runQbs(buildParams), 0);
- QVERIFY2(m_qbsStdout.contains("Creating dummy1.txt with p1 from profile"),
+ QVERIFY2(m_qbsStdout.contains("creating dummy1.txt with p1 from profile"),
m_qbsStdout.constData());
- QVERIFY2(m_qbsStdout.contains("Creating dummy2.txt with p2 from profile"),
+ QVERIFY2(m_qbsStdout.contains("creating dummy2.txt with p2 from profile"),
m_qbsStdout.constData());
// Now we do use the "resolve" command, so the new property value is taken into account.
QCOMPARE(runQbs(resolveParams), 0);
QCOMPARE(runQbs(buildParams), 0);
- QVERIFY2(!m_qbsStdout.contains("Creating dummy1.txt"), m_qbsStdout.constData());
- QVERIFY2(m_qbsStdout.contains("Creating dummy2.txt with p2 new from profile"),
+ QVERIFY2(!m_qbsStdout.contains("creating dummy1.txt"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("creating dummy2.txt with p2 new from profile"),
m_qbsStdout.constData());
// Now we change the profile again without a "resolve" command. However, this time we
@@ -1125,8 +1125,8 @@ void TestBlackbox::disappearedProfile()
"property string p1: 'p1 from module'");
QCOMPARE(runQbs(buildParams), 0);
QVERIFY2(m_qbsStdout.contains("Resolving"), m_qbsStdout.constData());
- QVERIFY2(!m_qbsStdout.contains("Creating dummy1.txt"), m_qbsStdout.constData());
- QVERIFY2(!m_qbsStdout.contains("Creating dummy2.txt"), m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("creating dummy1.txt"), m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("creating dummy2.txt"), m_qbsStdout.constData());
// Now we run the "resolve" command without giving the necessary settings path to find
// the profile.
@@ -2640,11 +2640,11 @@ void TestBlackbox::ruleWithNonRequiredInputs()
output = outFile.readAll();
QCOMPARE(output, QByteArray("(a.inp,b.inp,c.inp,)"));
QCOMPARE(runQbs(), 0);
- QVERIFY2(!m_qbsStdout.contains("Generating"), m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("generating"), m_qbsStdout.constData());
WAIT_FOR_NEW_TIMESTAMP();
touch("a.inp");
QCOMPARE(runQbs(), 0);
- QVERIFY2(m_qbsStdout.contains("Generating"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("generating"), m_qbsStdout.constData());
}
void TestBlackbox::sanitizer_data()
@@ -3386,9 +3386,9 @@ void TestBlackbox::propertyChanges()
QVERIFY(m_qbsStdout.contains("compiling lib.cpp"));
QVERIFY(m_qbsStdout.contains("linking product 1.debug"));
QVERIFY(m_qbsStdout.contains("generated.txt"));
- QVERIFY(m_qbsStdout.contains("Making output from input"));
+ QVERIFY(m_qbsStdout.contains("making output from input"));
QVERIFY(m_qbsStdout.contains("default value"));
- QVERIFY(m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(m_qbsStdout.contains("making output from other output"));
QFile generatedFile(relativeProductBuildDir("generated text file") + "/generated.txt");
QVERIFY(generatedFile.open(QIODevice::ReadOnly));
QCOMPARE(generatedFile.readAll(), QByteArray("prefix 1contents 1suffix 1"));
@@ -3402,8 +3402,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("compiling lib.cpp.cpp"));
QVERIFY(!m_qbsStdout.contains("linking"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
// Incremental build with no changes, but updated project file timestamp.
WAIT_FOR_NEW_TIMESTAMP();
@@ -3415,8 +3415,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("compiling lib.cpp"));
QVERIFY(!m_qbsStdout.contains("linking"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
// Incremental build, input property changed for first product
WAIT_FOR_NEW_TIMESTAMP();
@@ -3428,8 +3428,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("linking product 3"));
QVERIFY(!m_qbsStdout.contains("linking library"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
// Incremental build, input property changed via project for second product.
WAIT_FOR_NEW_TIMESTAMP();
@@ -3439,8 +3439,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(m_qbsStdout.contains("compiling source2.cpp"));
QVERIFY(!m_qbsStdout.contains("linking product 3"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
// Incremental build, input property changed via command line for second product.
params.command = "resolve";
@@ -3458,8 +3458,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(m_qbsStdout.contains("compiling source2.cpp"));
QVERIFY(!m_qbsStdout.contains("linking product 3"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
// Incremental build, input property changed via environment for third product.
params.environment.insert("QBS_BLACKBOX_DEFINE", "newvalue");
@@ -3474,8 +3474,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("linking product 2"));
QVERIFY(!m_qbsStdout.contains("compiling source3.cpp"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
params.environment.insert("QBS_BLACKBOX_DEFINE", "newvalue");
QCOMPARE(runQbs(params), 0);
QCOMPARE(runQbs(), 0);
@@ -3490,8 +3490,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("linking product 2"));
QVERIFY(m_qbsStdout.contains("compiling source3.cpp"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
// Incremental build, module property changed via command line.
params.arguments << "qbs.enableDebugCode:false";
@@ -3511,8 +3511,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(m_qbsStdout.contains("compiling source2.cpp"));
QVERIFY(m_qbsStdout.contains("compiling source3.cpp"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
// Incremental build, non-essential dependency removed.
WAIT_FOR_NEW_TIMESTAMP();
@@ -3524,8 +3524,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("linking product 3"));
QVERIFY(!m_qbsStdout.contains("linking library"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
// Incremental build, prepare script of a transformer changed.
WAIT_FOR_NEW_TIMESTAMP();
@@ -3536,8 +3536,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("compiling source3.cpp"));
QVERIFY(!m_qbsStdout.contains("compiling lib.cpp"));
QVERIFY(m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
QVERIFY(generatedFile.open(QIODevice::ReadOnly));
QCOMPARE(generatedFile.readAll(), QByteArray("prefix 1contents 2suffix 1"));
generatedFile.close();
@@ -3551,8 +3551,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("compiling source3.cpp"));
QVERIFY(!m_qbsStdout.contains("compiling lib.cpp"));
QVERIFY(m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
QVERIFY(generatedFile.open(QIODevice::ReadOnly));
QCOMPARE(generatedFile.readAll(), QByteArray("prefix 2contents 2suffix 1"));
generatedFile.close();
@@ -3566,8 +3566,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("compiling source3.cpp"));
QVERIFY(!m_qbsStdout.contains("compiling lib.cpp"));
QVERIFY(m_qbsStdout.contains("generated.txt"));
- QVERIFY(!m_qbsStdout.contains("Making output from input"));
- QVERIFY(!m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(!m_qbsStdout.contains("making output from input"));
+ QVERIFY(!m_qbsStdout.contains("making output from other output"));
QVERIFY(generatedFile.open(QIODevice::ReadOnly));
QCOMPARE(generatedFile.readAll(), QByteArray("prefix 2contents 2suffix 2"));
generatedFile.close();
@@ -3581,8 +3581,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("compiling source3.cpp"));
QVERIFY(!m_qbsStdout.contains("compiling lib.cpp"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(m_qbsStdout.contains("Making output from input"));
- QVERIFY(m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(m_qbsStdout.contains("making output from input"));
+ QVERIFY(m_qbsStdout.contains("making output from other output"));
QVERIFY(m_qbsStdout.contains("new value"));
// Incremental build, prepare script of a rule in a module changed.
@@ -3595,8 +3595,8 @@ void TestBlackbox::propertyChanges()
QVERIFY(!m_qbsStdout.contains("compiling source3.cpp"));
QVERIFY(!m_qbsStdout.contains("compiling lib.cpp"));
QVERIFY(!m_qbsStdout.contains("generated.txt"));
- QVERIFY(m_qbsStdout.contains("Making output from input"));
- QVERIFY(m_qbsStdout.contains("Making output from other output"));
+ QVERIFY(m_qbsStdout.contains("making output from input"));
+ QVERIFY(m_qbsStdout.contains("making output from other output"));
}
void TestBlackbox::propertyEvaluationContext()
@@ -3939,7 +3939,7 @@ void TestBlackbox::exportRule()
params.expectFailure = false;
QCOMPARE(runQbs(params), 0);
QCOMPARE(runQbs(), 0);
- QVERIFY2(m_qbsStdout.contains("Creating C++ source file"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("creating C++ source file"), m_qbsStdout.constData());
QVERIFY2(m_qbsStdout.contains("compiling myapp.cpp"), m_qbsStdout.constData());
}
@@ -3957,8 +3957,8 @@ void TestBlackbox::exportsPkgconfig()
{
QDir::setCurrent(testDataDir + "/exports-pkgconfig");
QCOMPARE(runQbs(), 0);
- QVERIFY2(m_qbsStdout.contains("Creating TheFirstLib.pc"), m_qbsStdout.constData());
- QVERIFY2(m_qbsStdout.contains("Creating TheSecondLib.pc"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("creating TheFirstLib.pc"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("creating TheSecondLib.pc"), m_qbsStdout.constData());
QFile sourcePcFile(HostOsInfo::isWindowsHost() ? "TheFirstLib_windows.pc" : "TheFirstLib.pc");
QString generatedPcFilePath = relativeProductBuildDir("TheFirstLib") + "/TheFirstLib.pc";
QFile generatedPcFile(generatedPcFilePath);
@@ -3973,8 +3973,8 @@ void TestBlackbox::exportsPkgconfig()
touch("firstlib.cpp");
QCOMPARE(runQbs(), 0);
QVERIFY2(m_qbsStdout.contains("linking"), m_qbsStdout.constData());
- QVERIFY2(!m_qbsStdout.contains("Creating TheFirstLib.pc"), m_qbsStdout.constData());
- QVERIFY2(!m_qbsStdout.contains("Creating TheSecondLib.pc"), m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("creating TheFirstLib.pc"), m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("creating TheSecondLib.pc"), m_qbsStdout.constData());
}
void TestBlackbox::exportsQbs()
@@ -4024,19 +4024,19 @@ void TestBlackbox::exportsQbs()
// Change tracking for accesses to product.exports (negative).
QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList{"-f", "exports-qbs.qbs"})), 0);
QCOMPARE(runQbs(), 0);
- QVERIFY2(m_qbsStdout.contains("Creating MyTool.qbs"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("creating MyTool.qbs"), m_qbsStdout.constData());
WAIT_FOR_NEW_TIMESTAMP();
touch("exports-qbs.qbs");
QCOMPARE(runQbs(QStringList({"-p", "MyTool"})), 0);
- QVERIFY2(!m_qbsStdout.contains("Creating MyTool.qbs"), m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("creating MyTool.qbs"), m_qbsStdout.constData());
// Rebuilding the target binary should not cause recreating the module file.
WAIT_FOR_NEW_TIMESTAMP();
touch("mylib.cpp");
QCOMPARE(runQbs(), 0);
QVERIFY2(m_qbsStdout.count("linking") >= 2, m_qbsStdout.constData());
- QVERIFY2(!m_qbsStdout.contains("Creating MyLib"), m_qbsStdout.constData());
- QVERIFY2(!m_qbsStdout.contains("Creating MyTool.qbs"), m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("creating MyLib"), m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("creating MyTool.qbs"), m_qbsStdout.constData());
// Changing a setting that influences the name of a target artifact should cause
// recreating the module file.
@@ -4045,14 +4045,14 @@ void TestBlackbox::exportsQbs()
QCOMPARE(runQbs(resolveParams), 0);
QCOMPARE(runQbs(), 0);
QVERIFY2(m_qbsStdout.count("linking") >= 2, m_qbsStdout.constData());
- QVERIFY2(m_qbsStdout.count("Creating MyLib") == 2, m_qbsStdout.constData());
- QVERIFY2(!m_qbsStdout.contains("Creating MyTool.qbs"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.count("creating MyLib") == 2, m_qbsStdout.constData());
+ QVERIFY2(!m_qbsStdout.contains("creating MyTool.qbs"), m_qbsStdout.constData());
// Change tracking for accesses to product.exports (positive).
WAIT_FOR_NEW_TIMESTAMP();
REPLACE_IN_FILE("tool.qbs", "exportingProduct.toolTags", "[]");
QCOMPARE(runQbs(QStringList({"-p", "MyTool"})), 0);
- QVERIFY2(m_qbsStdout.contains("Creating MyTool.qbs"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("creating MyTool.qbs"), m_qbsStdout.constData());
}
void TestBlackbox::externalLibs()
@@ -7269,9 +7269,9 @@ void TestBlackbox::autotests()
QVERIFY2(m_qbsStderr.contains(expectedErrorMessage), m_qbsStderr.constData());
return;
}
- QVERIFY2(m_qbsStdout.contains("Running test test1")
- && m_qbsStdout.contains("Running test test2")
- && m_qbsStdout.contains("Running test test3"), m_qbsStdout.constData());
+ QVERIFY2(m_qbsStdout.contains("running test test1")
+ && m_qbsStdout.contains("running test test2")
+ && m_qbsStdout.contains("running test test3"), m_qbsStdout.constData());
QCOMPARE(m_qbsStdout.count("PASS"), 2);
QCOMPARE(m_qbsStderr.count("FAIL"), 1);
}
@@ -7773,7 +7773,7 @@ void TestBlackbox::wildCardsAndRules()
{
QDir::setCurrent(testDataDir + "/wildcards-and-rules");
QCOMPARE(runQbs(), 0);
- QVERIFY(m_qbsStdout.contains("Creating output artifact"));
+ QVERIFY(m_qbsStdout.contains("creating output artifact"));
QFile output(relativeProductBuildDir("wildcards-and-rules") + "/test.mytype");
QVERIFY2(output.open(QIODevice::ReadOnly), qPrintable(output.errorString()));
QCOMPARE(output.readAll().count('\n'), 1);
@@ -7785,7 +7785,7 @@ void TestBlackbox::wildCardsAndRules()
QbsRunParameters params;
params.expectFailure = true;
QCOMPARE(runQbs(params), 0);
- QVERIFY(m_qbsStdout.contains("Creating output artifact"));
+ QVERIFY(m_qbsStdout.contains("creating output artifact"));
QVERIFY2(output.open(QIODevice::ReadOnly), qPrintable(output.errorString()));
QCOMPARE(output.readAll().count('\n'), 2);
output.close();
@@ -7794,11 +7794,11 @@ void TestBlackbox::wildCardsAndRules()
WAIT_FOR_NEW_TIMESTAMP();
touch("dep.dep");
QCOMPARE(runQbs(), 0);
- QVERIFY(m_qbsStdout.contains("Creating output artifact"));
+ QVERIFY(m_qbsStdout.contains("creating output artifact"));
// Add nothing.
QCOMPARE(runQbs(), 0);
- QVERIFY(!m_qbsStdout.contains("Creating output artifact"));
+ QVERIFY(!m_qbsStdout.contains("creating output artifact"));
}
void TestBlackbox::loadableModule()
@@ -8337,8 +8337,8 @@ void TestBlackbox::groupsInModules()
QSKIP("Cannot run binaries in cross-compiled build");
QbsRunParameters params;
QCOMPARE(runQbs(params), 0);
- QVERIFY(m_qbsStdout.contains("compile rock.coal => rock.diamond"));
- QVERIFY(m_qbsStdout.contains("compile chunk.coal => chunk.diamond"));
+ QVERIFY(m_qbsStdout.contains("compiling rock.coal to rock.diamond"));
+ QVERIFY(m_qbsStdout.contains("compiling chunk.coal to chunk.diamond"));
QVERIFY(m_qbsStdout.contains("compiling helper2.c"));
QVERIFY(!m_qbsStdout.contains("compiling helper3.c"));
QVERIFY(m_qbsStdout.contains("compiling helper4.c"));
@@ -8346,8 +8346,8 @@ void TestBlackbox::groupsInModules()
QVERIFY(!m_qbsStdout.contains("compiling helper6.c"));
QCOMPARE(runQbs(params), 0);
- QVERIFY(!m_qbsStdout.contains("compile rock.coal => rock.diamond"));
- QVERIFY(!m_qbsStdout.contains("compile chunk.coal => chunk.diamond"));
+ QVERIFY(!m_qbsStdout.contains("compiling rock.coal to rock.diamond"));
+ QVERIFY(!m_qbsStdout.contains("compiling chunk.coal to chunk.diamond"));
WAIT_FOR_NEW_TIMESTAMP();
touch("modules/helper/diamondc.c");
@@ -8355,8 +8355,8 @@ void TestBlackbox::groupsInModules()
waitForFileUnlock();
QCOMPARE(runQbs(params), 0);
QVERIFY(m_qbsStdout.contains("compiling diamondc.c"));
- QVERIFY(m_qbsStdout.contains("compile rock.coal => rock.diamond"));
- QVERIFY(m_qbsStdout.contains("compile chunk.coal => chunk.diamond"));
+ QVERIFY(m_qbsStdout.contains("compiling rock.coal to rock.diamond"));
+ QVERIFY(m_qbsStdout.contains("compiling chunk.coal to chunk.diamond"));
QVERIFY(regularFileExists(relativeProductBuildDir("groups-in-modules") + "/rock.diamond"));
QFile output(relativeProductBuildDir("groups-in-modules") + "/rock.diamond");
QVERIFY(output.open(QIODevice::ReadOnly));
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp
index bbaac1c21..4d4b94a96 100644
--- a/tests/auto/blackbox/tst_blackboxandroid.cpp
+++ b/tests/auto/blackbox/tst_blackboxandroid.cpp
@@ -133,7 +133,7 @@ void TestBlackboxAndroid::android()
QCOMPARE(runQbs(buildParams), 0);
for (const QString &productName : qAsConst(productNames)) {
const QByteArray tag(QTest::currentDataTag());
- QCOMPARE(m_qbsStdout.count("Generating BuildConfig.java"),
+ QCOMPARE(m_qbsStdout.count("generating BuildConfig.java"),
isIncrementalBuild ? 0 : productNames.size());
const QString packageName = productName + (generateAab ? ".aab" : ".apk");
QVERIFY(m_qbsStdout.contains(packageName.toLocal8Bit()));
diff --git a/tests/auto/blackbox/tst_blackboxjoblimits.cpp b/tests/auto/blackbox/tst_blackboxjoblimits.cpp
index df6435a2c..acaf69a5b 100644
--- a/tests/auto/blackbox/tst_blackboxjoblimits.cpp
+++ b/tests/auto/blackbox/tst_blackboxjoblimits.cpp
@@ -178,7 +178,7 @@ void TestBlackboxJobLimits::jobLimits()
else
QVERIFY2(m_qbsStderr.contains("exclusive"), m_qbsStderr.constData());
if (exitCode == 0)
- QCOMPARE(m_qbsStdout.count("Running tool"), 5);
+ QCOMPARE(m_qbsStdout.count("running tool"), 5);
}
QTEST_MAIN(TestBlackboxJobLimits)