diff options
Diffstat (limited to 'tests/auto/api/testdata')
77 files changed, 248 insertions, 124 deletions
diff --git a/tests/auto/api/testdata/QBS-728/QBS-728.qbs b/tests/auto/api/testdata/QBS-728/QBS-728.qbs index 5969e13cc..cdeb7c6db 100644 --- a/tests/auto/api/testdata/QBS-728/QBS-728.qbs +++ b/tests/auto/api/testdata/QBS-728/QBS-728.qbs @@ -1,5 +1,5 @@ Product { - property bool isBlubbOS: qbs.targetOS.contains("blubb-OS") + property bool isBlubbOS: qbs.targetOS.includes("blubb-OS") qbs.profiles: isBlubbOS ? ["blubb-profile"] : [project.profile] qbs.architecture: "blubb-arch" } diff --git a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs index 4cc25ad66..db707f515 100644 --- a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs +++ b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs @@ -26,7 +26,7 @@ Project { // HACK: cpp.entryPoint currently not working 100% with gcc Properties { - condition: qbs.toolchain.contains("msvc") + condition: qbs.toolchain.includes("msvc") cpp.entryPoint: "main" cpp.dynamicLibraries: ["ucrt", "kernel32"] } diff --git a/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs index 571feced8..3237e90dc 100644 --- a/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs +++ b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs @@ -6,11 +6,6 @@ Project { Depends { name: 'cpp' } - Properties { - condition: qbs.toolchain.contains("gcc") - cpp.cxxFlags: "-march=native" - } - Group { cpp.defines: ['WORLD="BANANA"'] files : [ "main.cpp" ] diff --git a/tests/auto/api/testdata/build-properties-source/main.cpp b/tests/auto/api/testdata/build-properties-source/main.cpp index f830ee1fd..89ec55463 100644 --- a/tests/auto/api/testdata/build-properties-source/main.cpp +++ b/tests/auto/api/testdata/build-properties-source/main.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <stdio.h> +#include <cstdio> #ifndef WORLD # error WORLD is not defined @@ -34,5 +34,5 @@ int main() { - puts("Hello " WORLD "!"); + std::puts("Hello " WORLD "!"); } diff --git a/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs b/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs index 222dc4476..cb925eeca 100644 --- a/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs +++ b/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs @@ -18,7 +18,7 @@ Project { cpp.defines: ["XXXX"] Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } diff --git a/tests/auto/api/testdata/change-dependent-lib/main.cpp b/tests/auto/api/testdata/change-dependent-lib/main.cpp index 8ad414c46..9334da1ef 100644 --- a/tests/auto/api/testdata/change-dependent-lib/main.cpp +++ b/tests/auto/api/testdata/change-dependent-lib/main.cpp @@ -28,13 +28,12 @@ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_IMPORT int mylib_hello(); int main() { - puts("application says hello!"); + std::puts("application says hello!"); return mylib_hello(); } - diff --git a/tests/auto/api/testdata/change-dependent-lib/mylib.cpp b/tests/auto/api/testdata/change-dependent-lib/mylib.cpp index 28cb69f95..b8c3e9082 100644 --- a/tests/auto/api/testdata/change-dependent-lib/mylib.cpp +++ b/tests/auto/api/testdata/change-dependent-lib/mylib.cpp @@ -28,10 +28,10 @@ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_EXPORT int mylib_hello() { - puts("mylib says hello!"); + std::puts("mylib says hello!"); return 0; } diff --git a/tests/auto/api/testdata/codegen/codegen.qbs b/tests/auto/api/testdata/codegen/codegen.qbs index d8a217572..42e4c6b08 100644 --- a/tests/auto/api/testdata/codegen/codegen.qbs +++ b/tests/auto/api/testdata/codegen/codegen.qbs @@ -43,7 +43,7 @@ Project { // check whether multipart module name translation is working var actual = product.moduleProperty("Qt.core", "mocName"); - if (!actual || !actual.contains("moc")) + if (!actual || !actual.includes("moc")) throw "multipart module name translation is broken"; // check whether we can access project properties here @@ -57,7 +57,7 @@ Project { code = expandMacros(code, product.replacements); var args = ['echo ' + code + '>' + output.filePath] var cmd - if (product.moduleProperty("qbs", "hostOS").contains('windows')) { + if (product.moduleProperty("qbs", "hostOS").includes('windows')) { cmd = new Command(product.qbs.windowsShellPath, ['/C'].concat(args)); } else { args[0] = args[0].replace(/\(/g, '\\(') @@ -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/dependency-on-multiplexed-type/dependency-on-multiplexed-type.qbs b/tests/auto/api/testdata/dependency-on-multiplexed-type/dependency-on-multiplexed-type.qbs index cfc2769d2..f0ffebe39 100644 --- a/tests/auto/api/testdata/dependency-on-multiplexed-type/dependency-on-multiplexed-type.qbs +++ b/tests/auto/api/testdata/dependency-on-multiplexed-type/dependency-on-multiplexed-type.qbs @@ -1,5 +1,3 @@ -import qbs - Project { Product { name: "dep"; type: "x" } Product { diff --git a/tests/auto/api/testdata/disabled-product/disabled-product.qbs b/tests/auto/api/testdata/disabled-product/disabled-product.qbs index dad8f5d4c..e7eea7380 100644 --- a/tests/auto/api/testdata/disabled-product/disabled-product.qbs +++ b/tests/auto/api/testdata/disabled-product/disabled-product.qbs @@ -2,7 +2,7 @@ CppApplication { condition: false files: "main.cpp" Group { - condition: qbs.targetOS.contains("stuff") + condition: qbs.targetOS.includes("stuff") qbs.install: false } } diff --git a/tests/auto/api/testdata/disappeared-wildcard-file/disappeared-wildcard-file.qbs b/tests/auto/api/testdata/disappeared-wildcard-file/disappeared-wildcard-file.qbs new file mode 100644 index 000000000..3c38e18a7 --- /dev/null +++ b/tests/auto/api/testdata/disappeared-wildcard-file/disappeared-wildcard-file.qbs @@ -0,0 +1,4 @@ +Product { + name: "dummy" + files: "*.txt" +} diff --git a/tests/auto/api/testdata/disappeared-wildcard-file/file1.txt b/tests/auto/api/testdata/disappeared-wildcard-file/file1.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/auto/api/testdata/disappeared-wildcard-file/file1.txt diff --git a/tests/auto/api/testdata/disappeared-wildcard-file/file2.txt b/tests/auto/api/testdata/disappeared-wildcard-file/file2.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/auto/api/testdata/disappeared-wildcard-file/file2.txt diff --git a/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs b/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs index 05886a99e..0ebb73413 100644 --- a/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs +++ b/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs @@ -1,4 +1,5 @@ import qbs.FileInfo +import qbs.Host import qbs.TextFile Project { @@ -11,6 +12,12 @@ Project { } } Product { + condition: { + var result = qbs.targetPlatform === Host.platform(); + if (!result) + console.info("targetPlatform differs from hostPlatform"); + return result; + } name: "p" type: ["mytype"] diff --git a/tests/auto/api/testdata/export-simple/export-simple.qbs b/tests/auto/api/testdata/export-simple/export-simple.qbs index 01177049d..84ce5541d 100644 --- a/tests/auto/api/testdata/export-simple/export-simple.qbs +++ b/tests/auto/api/testdata/export-simple/export-simple.qbs @@ -43,7 +43,7 @@ Project { } Depends { name: "cpp" } Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } diff --git a/tests/auto/api/testdata/export-simple/lib1.cpp b/tests/auto/api/testdata/export-simple/lib1.cpp index 2b22d4993..7981edf92 100644 --- a/tests/auto/api/testdata/export-simple/lib1.cpp +++ b/tests/auto/api/testdata/export-simple/lib1.cpp @@ -27,10 +27,10 @@ ****************************************************************************/ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_EXPORT int lib1_hello() { - puts("lib1 says hello!"); + std::puts("lib1 says hello!"); return 0; } diff --git a/tests/auto/api/testdata/export-simple/main.cpp b/tests/auto/api/testdata/export-simple/main.cpp index 820e6f3bc..060037b82 100644 --- a/tests/auto/api/testdata/export-simple/main.cpp +++ b/tests/auto/api/testdata/export-simple/main.cpp @@ -27,13 +27,12 @@ ****************************************************************************/ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_IMPORT int lib1_hello(); int main() { - puts("application says hello!"); + std::puts("application says hello!"); return lib1_hello(); } - 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..687955f2f 100644 --- a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs +++ b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs @@ -1,3 +1,5 @@ +import qbs.Host + Project { CppApplication { type: "application" @@ -6,7 +8,7 @@ Project { name: "infinite-loop" cpp.cxxLanguageVersion: "c++11" Properties { - condition: qbs.toolchain.contains("gcc") + condition: qbs.toolchain.includes("gcc") cpp.driverFlags: "-pthread" } } @@ -17,14 +19,14 @@ Project { Depends { name: "infinite-loop" } Depends { name: "cpp" // Make sure build environment is set up properly. - condition: qbs.hostOS.contains("windows") && qbs.toolchain.contains("gcc") + condition: Host.os().includes("windows") && qbs.toolchain.includes("gcc") } Rule { inputsFromDependencies: "application" 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/infinite-loop-scanning-scan/file.in b/tests/auto/api/testdata/infinite-loop-scanning-scan/file.in new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/auto/api/testdata/infinite-loop-scanning-scan/file.in diff --git a/tests/auto/api/testdata/infinite-loop-scanning-scan/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-scanning-scan/infinite-loop.qbs new file mode 100644 index 000000000..5e3e33b6e --- /dev/null +++ b/tests/auto/api/testdata/infinite-loop-scanning-scan/infinite-loop.qbs @@ -0,0 +1,21 @@ +Product { + type: "t" + Depends { name: "m" } + Group { + files: "file.in" + fileTags: "i" + } + Rule { + inputs: "i" + Artifact { + filePath: "dummy" + fileTags: "t" + } + prepare: { + var cmd = new JavaScriptCommand(); + cmd.silent = true; + cmd.sourceCode = function() {}; + return cmd; + } + } +} diff --git a/tests/auto/api/testdata/infinite-loop-scanning-scan/modules/m/m.qbs b/tests/auto/api/testdata/infinite-loop-scanning-scan/modules/m/m.qbs new file mode 100644 index 000000000..9c8a18072 --- /dev/null +++ b/tests/auto/api/testdata/infinite-loop-scanning-scan/modules/m/m.qbs @@ -0,0 +1,6 @@ +Module { + Scanner { + inputs: "i" + scan: { while (true); } + } +}
\ No newline at end of file diff --git a/tests/auto/api/testdata/infinite-loop-scanning-searchpaths/file.in b/tests/auto/api/testdata/infinite-loop-scanning-searchpaths/file.in new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/auto/api/testdata/infinite-loop-scanning-searchpaths/file.in diff --git a/tests/auto/api/testdata/infinite-loop-scanning-searchpaths/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-scanning-searchpaths/infinite-loop.qbs new file mode 100644 index 000000000..5e3e33b6e --- /dev/null +++ b/tests/auto/api/testdata/infinite-loop-scanning-searchpaths/infinite-loop.qbs @@ -0,0 +1,21 @@ +Product { + type: "t" + Depends { name: "m" } + Group { + files: "file.in" + fileTags: "i" + } + Rule { + inputs: "i" + Artifact { + filePath: "dummy" + fileTags: "t" + } + prepare: { + var cmd = new JavaScriptCommand(); + cmd.silent = true; + cmd.sourceCode = function() {}; + return cmd; + } + } +} diff --git a/tests/auto/api/testdata/infinite-loop-scanning-searchpaths/modules/m/m.qbs b/tests/auto/api/testdata/infinite-loop-scanning-searchpaths/modules/m/m.qbs new file mode 100644 index 000000000..0476478b9 --- /dev/null +++ b/tests/auto/api/testdata/infinite-loop-scanning-searchpaths/modules/m/m.qbs @@ -0,0 +1,7 @@ +Module { + Scanner { + inputs: "i" + searchPaths: { while (true); } + scan: [] + } +} diff --git a/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs b/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs index d3f91662a..e4e050213 100644 --- a/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs +++ b/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs @@ -17,6 +17,7 @@ Project { } qbs.installPrefix: "/usr" install: true + installDebugInformation: false installDir: "bin" Group { fileTagsFilter: "obj" diff --git a/tests/auto/api/testdata/is-runnable/is-runnable.qbs b/tests/auto/api/testdata/is-runnable/is-runnable.qbs index 870279294..e93cc38aa 100644 --- a/tests/auto/api/testdata/is-runnable/is-runnable.qbs +++ b/tests/auto/api/testdata/is-runnable/is-runnable.qbs @@ -5,7 +5,7 @@ Project { DynamicLibrary { name: "lib" Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } diff --git a/tests/auto/api/testdata/lib-same-source/main.cpp b/tests/auto/api/testdata/lib-same-source/main.cpp index 47e1013f9..c9602f59f 100644 --- a/tests/auto/api/testdata/lib-same-source/main.cpp +++ b/tests/auto/api/testdata/lib-same-source/main.cpp @@ -26,9 +26,9 @@ ** ****************************************************************************/ -#include <stdio.h> +#include <cstdio> int main() { - puts("Hello WOrld!"); + std::puts("Hello WOrld!"); } diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic1.cpp b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic1.cpp index ed5f822fb..555c91afe 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic1.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic1.cpp @@ -1,4 +1,4 @@ -#include <stdio.h> +#include <cstdio> #include "../dllexport.h" @@ -7,6 +7,6 @@ void static1_hello(); DLL_EXPORT int dynamic1_hello() { static1_hello(); - puts("dynamic1 says hello!"); + std::puts("dynamic1 says hello!"); return 0; } diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic2.cpp b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic2.cpp index b2db5d23e..d5fcbaab4 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic2.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/dynamic2.cpp @@ -1,10 +1,10 @@ #include "../dllexport.h" #include "static2.h" -#include <stdio.h> +#include <cstdio> DLL_EXPORT void dynamic2_hello() { TestMe tm; tm.hello(); - puts("dynamic2 says hello!"); + std::puts("dynamic2 says hello!"); } diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs index b2a54080c..0c86d05c6 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs @@ -12,7 +12,7 @@ Project { Depends { name: "cpp" } Depends { name: "static1" } Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } @@ -31,7 +31,7 @@ Project { Depends { name: "static2" } cpp.visibility: 'hidden' Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } @@ -40,6 +40,11 @@ Project { name: "static2" files: [ "static2.cpp", "static2.h" ] Depends { name: "cpp" } + Probe { + id: tcPrinter + property bool isGcc: qbs.toolchain.contains("gcc") + configure: { console.info("is gcc: " + isGcc); } + } } } diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/main.cpp b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/main.cpp index 73c0922d6..9b0a190b4 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/main.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/main.cpp @@ -1,11 +1,11 @@ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_IMPORT int dynamic1_hello(); int main() { int result = dynamic1_hello(); - puts("application says hello!"); + std::puts("application says hello!"); return result; } diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static1.cpp b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static1.cpp index 81c53bd4e..d07910f96 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static1.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static1.cpp @@ -1,10 +1,10 @@ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_IMPORT void dynamic2_hello(); void static1_hello() { dynamic2_hello(); - puts("static1 says hello!"); + std::puts("static1 says hello!"); } diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static2.cpp b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static2.cpp index 073b13609..99a60be0c 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static2.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/static2.cpp @@ -1,7 +1,7 @@ #include "static2.h" -#include <stdio.h> +#include <cstdio> void TestMe::hello() const { - puts("static2 says hello!"); + std::puts("static2 says hello!"); } diff --git a/tests/auto/api/testdata/link-dynamiclibs/lib1.cpp b/tests/auto/api/testdata/link-dynamiclibs/lib1.cpp index 14666cf58..e2e943b37 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/lib1.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs/lib1.cpp @@ -27,13 +27,13 @@ ****************************************************************************/ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_IMPORT void lib2_hello(); DLL_EXPORT int lib1_hello() { - puts("lib1 says hello!"); + std::puts("lib1 says hello!"); lib2_hello(); return 0; } diff --git a/tests/auto/api/testdata/link-dynamiclibs/lib2.cpp b/tests/auto/api/testdata/link-dynamiclibs/lib2.cpp index 01938b16b..f8bf990a3 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/lib2.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs/lib2.cpp @@ -27,13 +27,13 @@ ****************************************************************************/ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_IMPORT void lib3_hello(); DLL_EXPORT void lib2_hello() { - puts("lib2 says hello!"); + std::puts("lib2 says hello!"); lib3_hello(); } diff --git a/tests/auto/api/testdata/link-dynamiclibs/lib3.cpp b/tests/auto/api/testdata/link-dynamiclibs/lib3.cpp index b90a99981..ff2d351ba 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/lib3.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs/lib3.cpp @@ -27,11 +27,11 @@ ****************************************************************************/ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_EXPORT void lib3_hello() { - puts("lib3 says hello!"); + std::puts("lib3 says hello!"); } DLL_EXPORT char* lib3_greeting() diff --git a/tests/auto/api/testdata/link-dynamiclibs/lib4.cpp b/tests/auto/api/testdata/link-dynamiclibs/lib4.cpp index 2d66e40f6..ebb97afc9 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/lib4.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs/lib4.cpp @@ -34,10 +34,10 @@ TestMe::TestMe() void TestMe::hello1() const { - puts("lib4 says hello!"); + std::puts("lib4 says hello!"); } void TestMe::hello2Impl() const { - puts("lib4 says hello inline!"); + std::puts("lib4 says hello inline!"); } diff --git a/tests/auto/api/testdata/link-dynamiclibs/lib4.h b/tests/auto/api/testdata/link-dynamiclibs/lib4.h index 63258b2ea..69bde04ec 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/lib4.h +++ b/tests/auto/api/testdata/link-dynamiclibs/lib4.h @@ -30,7 +30,7 @@ #define LIB4_H #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> #ifdef TEST_LIB # define LIB_EXPORT DLL_EXPORT diff --git a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs index cc86a4402..e0bce7264 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs +++ b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs @@ -17,7 +17,7 @@ Project { Depends { name: "cpp" } Depends { name: "lib2" } Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } @@ -31,7 +31,7 @@ Project { Depends { name: "cpp" } Depends { name: "lib3" } Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } @@ -44,7 +44,7 @@ Project { } Depends { name: "cpp" } Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } @@ -58,13 +58,13 @@ Project { } Depends { name: "cpp" } Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } Export { Depends { name: "cpp" } - cpp.includePaths: [product.sourceDirectory] + cpp.includePaths: [exportingProduct.sourceDirectory] } } } diff --git a/tests/auto/api/testdata/link-dynamiclibs/main.cpp b/tests/auto/api/testdata/link-dynamiclibs/main.cpp index 64f7948cb..b6165d30f 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/main.cpp +++ b/tests/auto/api/testdata/link-dynamiclibs/main.cpp @@ -26,14 +26,14 @@ ** ****************************************************************************/ -#include <stdio.h> +#include <cstdio> #include <lib4.h> DLL_IMPORT int lib1_hello(); int main() { - puts("application says hello!"); + std::puts("application says hello!"); TestMe test; test.hello1(); test.hello2(); diff --git a/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs b/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs index 6960c7d17..829aa5f3e 100644 --- a/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs +++ b/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs @@ -25,7 +25,7 @@ Project { Depends { name: "helper2" } Export { Depends { name: "cpp" } - cpp.includePaths: [product.sourceDirectory + '/helper1'] + cpp.includePaths: [exportingProduct.sourceDirectory + '/helper1'] } } @@ -38,7 +38,7 @@ Project { Depends { name: "cpp" } Export { Depends { name: "cpp" } - cpp.includePaths: [product.sourceDirectory + '/helper2'] + cpp.includePaths: [exportingProduct.sourceDirectory + '/helper2'] } } } diff --git a/tests/auto/api/testdata/link-static-lib/main.cpp b/tests/auto/api/testdata/link-static-lib/main.cpp index 5f6aed0b9..2d94a4b0b 100644 --- a/tests/auto/api/testdata/link-static-lib/main.cpp +++ b/tests/auto/api/testdata/link-static-lib/main.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <stdio.h> +#include <cstdio> int bla(); diff --git a/tests/auto/api/testdata/link-static-lib/mystaticlib.cpp b/tests/auto/api/testdata/link-static-lib/mystaticlib.cpp index 71777ef05..0b5d02fd4 100644 --- a/tests/auto/api/testdata/link-static-lib/mystaticlib.cpp +++ b/tests/auto/api/testdata/link-static-lib/mystaticlib.cpp @@ -26,12 +26,13 @@ ** ****************************************************************************/ -#include <stdio.h> #include <helper1.h> +#include <cstdio> + int bla() { int n = getSomeNumber(); - printf("Hello World! The magic number is %d.", n); + std::printf("Hello World! The magic number is %d.", n); return n; } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp index 3f8a5f8d7..b4379f8c9 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic1.cpp @@ -1,11 +1,11 @@ #include "../dllexport.h" #include "static2.h" -#include <stdio.h> +#include <cstdio> DLL_EXPORT int dynamic1_hello() { TestMe tm; tm.hello(); - puts("dynamic1 says hello!"); + std::puts("dynamic1 says hello!"); return 1; } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp index 75594185e..3511b4759 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/dynamic2.cpp @@ -1,7 +1,7 @@ #include "../dllexport.h" -#include <stdio.h> +#include <cstdio> DLL_EXPORT void dynamic2_hello() { - puts("dynamic2 says hello!"); + std::puts("dynamic2 says hello!"); } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs index d7ed6c862..c30cf40f9 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs @@ -14,9 +14,13 @@ Project { Probe { id: osCheck - property bool isNormalUnix: qbs.targetOS.contains("unix") - && !qbs.targetOS.contains("darwin") - configure: { console.info("is normal unix: " + (isNormalUnix ? "yes" : "no")); } + property bool isNormalUnix: qbs.targetOS.includes("unix") + && !qbs.targetOS.includes("darwin") + property bool isGcc: qbs.toolchain.contains("gcc") + configure: { + console.info("is normal unix: " + (isNormalUnix ? "yes" : "no")); + console.info("is gcc: " + isGcc); + } } } @@ -26,7 +30,7 @@ Project { Depends { name: "cpp" } Depends { name: "static2" } Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } @@ -44,7 +48,7 @@ Project { Depends { name: "cpp" } cpp.visibility: 'hidden' Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/main.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/main.cpp index 4b8193341..b9e522ac4 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/main.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/main.cpp @@ -1,10 +1,10 @@ -#include <stdio.h> +#include <cstdio> void static1_hello(); int main() { static1_hello(); - puts("application says hello!"); + std::puts("application says hello!"); return 0; } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp index a3058c63b..320344f91 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static1.cpp @@ -1,10 +1,11 @@ #include "../dllexport.h" -#include <stdio.h> + +#include <cstdio> DLL_IMPORT int dynamic1_hello(); void static1_hello() { int n = dynamic1_hello(); - printf("static%d says hello!\n", n); + std::printf("static%d says hello!\n", n); } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp index 374bf7ceb..88c6d2a3f 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/static2.cpp @@ -1,11 +1,11 @@ #include "../dllexport.h" #include "static2.h" -#include <stdio.h> +#include <cstdio> DLL_IMPORT void dynamic2_hello(); void TestMe::hello() const { dynamic2_hello(); - puts("static2 says hello!"); + std::puts("static2 says hello!"); } diff --git a/tests/auto/api/testdata/lots-of-dots/m.a.i.n.cpp b/tests/auto/api/testdata/lots-of-dots/m.a.i.n.cpp index 427f9907d..e1701dc47 100644 --- a/tests/auto/api/testdata/lots-of-dots/m.a.i.n.cpp +++ b/tests/auto/api/testdata/lots-of-dots/m.a.i.n.cpp @@ -33,6 +33,6 @@ int main() { ObjectNarf obj; - puts("..."); + std::puts("..."); } diff --git a/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs b/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs index a484b9c22..38d3d88ca 100644 --- a/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs +++ b/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs @@ -11,7 +11,7 @@ Project { files: ["object.cpp", "object.h"] Group { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") files: ["object2.mm", "object2.h"] } } diff --git a/tests/auto/api/testdata/moc-hpp-included/object.cpp b/tests/auto/api/testdata/moc-hpp-included/object.cpp index 4f1502af5..dd0b237cf 100644 --- a/tests/auto/api/testdata/moc-hpp-included/object.cpp +++ b/tests/auto/api/testdata/moc-hpp-included/object.cpp @@ -38,6 +38,6 @@ Object::Object(QObject *parent) int main() { Object obj; - printf("Hello World\n"); + std::printf("Hello World\n"); } diff --git a/tests/auto/api/testdata/moc-hpp/object.cpp b/tests/auto/api/testdata/moc-hpp/object.cpp index 601893c34..4c0e59393 100644 --- a/tests/auto/api/testdata/moc-hpp/object.cpp +++ b/tests/auto/api/testdata/moc-hpp/object.cpp @@ -36,6 +36,6 @@ Object::Object(QObject *parent) int main() { Object obj; - printf("Hello World\n"); + std::printf("Hello World\n"); } diff --git a/tests/auto/api/testdata/multiplexing/multiplexing.qbs b/tests/auto/api/testdata/multiplexing/multiplexing.qbs index 243c73d46..75958ed60 100644 --- a/tests/auto/api/testdata/multiplexing/multiplexing.qbs +++ b/tests/auto/api/testdata/multiplexing/multiplexing.qbs @@ -74,6 +74,13 @@ Project { qbs.architectures: ["TRS-80", "C64"] qbs.buildVariants: ["debug", "release"] } + Product { + name: "multiplex-without-aggregator-4-depends-2" + multiplexByQbsProperties: ["architectures", "buildVariants"] + qbs.architectures: ["TRS-80", "C64"] + qbs.buildVariants: ["debug", "release"] + Depends { name: "multiplex-without-aggregator-2" } + } } Product { diff --git a/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs index 5c3e475b0..e87af67c7 100644 --- a/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs +++ b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs @@ -4,7 +4,7 @@ Project { name: "lib" files: "lib.cpp" Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } diff --git a/tests/auto/api/testdata/objc/objc.qbs b/tests/auto/api/testdata/objc/objc.qbs index 845eb8d32..2fba48d9b 100644 --- a/tests/auto/api/testdata/objc/objc.qbs +++ b/tests/auto/api/testdata/objc/objc.qbs @@ -1,6 +1,6 @@ Project { CppApplication { - condition: qbs.targetOS.contains("macos") + condition: qbs.targetOS.includes("macos") files: "main.mm" cpp.frameworks: [ "Foundation" ] } 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 84706ace8..dc9ff2839 100644 --- a/tests/auto/api/testdata/process-result/process-result.qbs +++ b/tests/auto/api/testdata/process-result/process-result.qbs @@ -1,9 +1,18 @@ +import qbs.Host + Project { CppApplication { name: "app" + consoleApplication: true files: ["main.cpp"] } Product { + condition: { + var result = qbs.targetPlatform === Host.platform(); + if (!result) + console.info("targetPlatform differs from hostPlatform"); + return result; + } name: "app-caller" type: "mytype" Depends { name: "app" } @@ -20,7 +29,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/project-with-properties-item/project-with-properties-item.qbs b/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs index 866ec4ecb..812c6a65e 100644 --- a/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs +++ b/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs @@ -3,7 +3,7 @@ Project { property string libPath: "/usr/lib" Properties { - condition: qbs.targetOS.contains("macos") + condition: qbs.targetOS.includes("macos") binPath: "/Users/boo" libPath: "/Libraries/foo" } diff --git a/tests/auto/api/testdata/properties-blocks/main.cpp b/tests/auto/api/testdata/properties-blocks/main.cpp index 5473bffa7..a01a5850e 100644 --- a/tests/auto/api/testdata/properties-blocks/main.cpp +++ b/tests/auto/api/testdata/properties-blocks/main.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <stdio.h> +#include <cstdio> #ifndef HAVE_MAIN_CPP # error missing define HAVE_MAIN_CPP @@ -38,9 +38,8 @@ int main() { #ifdef _DEBUG - puts("Hello World! (debug version)"); + std::puts("Hello World! (debug version)"); #else - puts("Hello World! (release version)"); + std::puts("Hello World! (release version)"); #endif } - diff --git a/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs b/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs index dda4652d2..c234a6b41 100644 --- a/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs +++ b/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs @@ -14,7 +14,7 @@ Product { } Properties { - condition: qbs.targetOS.contains("weird") + condition: qbs.targetOS.includes("weird") cpp.staticLibraries: "abc" } diff --git a/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs index 204711625..1558e3bc9 100644 --- a/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs +++ b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs @@ -1,4 +1,3 @@ -import qbs.base import qbs.File import qbs.FileInfo @@ -8,7 +7,7 @@ DynamicLibrary { Depends { name: "Qt.core" } Depends { name: "cpp" } Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } diff --git a/tests/auto/api/testdata/remove-file-dependency/main.cpp b/tests/auto/api/testdata/remove-file-dependency/main.cpp index 5c0b03938..47cd716d7 100644 --- a/tests/auto/api/testdata/remove-file-dependency/main.cpp +++ b/tests/auto/api/testdata/remove-file-dependency/main.cpp @@ -31,7 +31,7 @@ int main() { - printf("The magic value is %d.\n", magicValue()); + std::printf("The magic value is %d.\n", magicValue()); return 0; } diff --git a/tests/auto/api/testdata/rename-product/rename.qbs b/tests/auto/api/testdata/rename-product/rename.qbs index 9d23bf804..aa59d9650 100644 --- a/tests/auto/api/testdata/rename-product/rename.qbs +++ b/tests/auto/api/testdata/rename-product/rename.qbs @@ -11,7 +11,7 @@ Project { cpp.defines: "MY_EXPORT=DLL_EXPORT" files: "lib.cpp" Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } diff --git a/tests/auto/api/testdata/rename-target-artifact/rename.qbs b/tests/auto/api/testdata/rename-target-artifact/rename.qbs index 810b0eb08..aea4b8d9e 100644 --- a/tests/auto/api/testdata/rename-target-artifact/rename.qbs +++ b/tests/auto/api/testdata/rename-target-artifact/rename.qbs @@ -14,7 +14,7 @@ Project { qbs.buildVariant: "release" files: "lib.cpp" Properties { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") bundle.isBundle: false } } diff --git a/tests/auto/api/testdata/renamed-qbs-source-file/renamed-qbs-source-file.qbs b/tests/auto/api/testdata/renamed-qbs-source-file/renamed-qbs-source-file.qbs new file mode 100644 index 000000000..d295d43ea --- /dev/null +++ b/tests/auto/api/testdata/renamed-qbs-source-file/renamed-qbs-source-file.qbs @@ -0,0 +1,9 @@ +Project { + references: "the-product/the-prodduct.qbs" + Product { + Group { + files: "the-product/*.qbs" + fileTags: [] + } + } +} diff --git a/tests/auto/api/testdata/renamed-qbs-source-file/the-product/the-prodduct.qbs b/tests/auto/api/testdata/renamed-qbs-source-file/the-product/the-prodduct.qbs new file mode 100644 index 000000000..86718b571 --- /dev/null +++ b/tests/auto/api/testdata/renamed-qbs-source-file/the-product/the-prodduct.qbs @@ -0,0 +1 @@ +Product { } diff --git a/tests/auto/api/testdata/restored-warnings/restored-warnings.qbs b/tests/auto/api/testdata/restored-warnings/restored-warnings.qbs index bbdfbeadb..9d4abb757 100644 --- a/tests/auto/api/testdata/restored-warnings/restored-warnings.qbs +++ b/tests/auto/api/testdata/restored-warnings/restored-warnings.qbs @@ -1,14 +1,25 @@ import qbs.Process 1.5 -CppApplication { - name: "theProduct" +Project { + CppApplication { + name: "theProduct" - property bool moreFiles: false - cpp.blubb: true + cpp.blubb: true - files: ["file.cpp", "main.cpp"] - Group { - condition: moreFiles - files: ["blubb.cpp"] + files: ["file.cpp", "main.cpp"] + } + + Product { + name: "theOtherProduct" + property bool dummy: { throw "this one comes from a thread"; } + } + + Product { + name: "aThirdProduct" + property bool moreFiles: false + Group { + condition: moreFiles + files: ["blubb.txt"] + } } } diff --git a/tests/auto/api/testdata/same-base-name/same-base-name.qbs b/tests/auto/api/testdata/same-base-name/same-base-name.qbs index 8448d04fd..ba0adfaac 100644 --- a/tests/auto/api/testdata/same-base-name/same-base-name.qbs +++ b/tests/auto/api/testdata/same-base-name/same-base-name.qbs @@ -16,7 +16,7 @@ Project { ] Group { - condition: qbs.targetOS.contains("darwin") + condition: qbs.targetOS.includes("darwin") files: [ "lib.m", "lib.mm" @@ -25,7 +25,7 @@ Project { Export { Depends { name: "cpp" } - cpp.frameworks: qbs.targetOS.contains("darwin") ? "Foundation" : undefined + cpp.frameworks: qbs.targetOS.includes("darwin") ? "Foundation" : undefined } } } diff --git a/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs index b584b4d41..67800b8eb 100644 --- a/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs +++ b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs @@ -44,23 +44,23 @@ Project { ] Group { - condition: qbs.targetOS.contains("macos") + condition: qbs.targetOS.includes("macos") files: ["d.mm"] } Properties { - condition: qbs.targetOS.contains("windows") + condition: qbs.targetOS.includes("windows") cpp.defines: ["WITH_SETUPAPI"] cpp.staticLibraries: ["setupapi"] } Properties { - condition: qbs.targetOS.contains("macos") + condition: qbs.targetOS.includes("macos") cpp.defines: ["WITH_LEX_YACC"] cpp.staticLibraries: ["l", "y"] cpp.frameworks: ["Foundation"] } Properties { - condition: qbs.targetOS.contains("linux") + condition: qbs.targetOS.includes("linux") cpp.defines: ["WITH_PTHREAD"] cpp.staticLibraries: ["pthread"] } @@ -84,7 +84,7 @@ Project { Depends { name: "e" } Properties { - condition: qbs.targetOS.contains("linux") + condition: qbs.targetOS.includes("linux") cpp.driverFlags: ["-static"] } 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 bb8deac9b..403506eed 100644 --- a/tests/auto/api/testdata/timeout-process/timeout.qbs +++ b/tests/auto/api/testdata/timeout-process/timeout.qbs @@ -1,3 +1,5 @@ +import qbs.Host + Project { CppApplication { type: "application" @@ -7,25 +9,31 @@ Project { cpp.cxxLanguageVersion: "c++11" cpp.minimumOsxVersion: "10.8" // For <chrono> Properties { - condition: qbs.toolchain.contains("gcc") + condition: qbs.toolchain.includes("gcc") cpp.driverFlags: "-pthread" } } Product { + condition: { + var result = qbs.targetPlatform === Host.platform(); + if (!result) + console.info("targetPlatform differs from hostPlatform"); + return result; + } type: "product-under-test" name: "caller" Depends { name: "infinite-loop" } Depends { name: "cpp" // Make sure build environment is set up properly. - condition: qbs.hostOS.contains("windows") && qbs.toolchain.contains("gcc") + condition: Host.os().includes("windows") && qbs.toolchain.includes("gcc") } Rule { inputsFromDependencies: "application" 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/tool-in-module/use-outside-project/modules/thetool/thetool.qbs b/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs index d72ebda17..e2b1ec6df 100644 --- a/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs +++ b/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs @@ -1,11 +1,12 @@ import qbs.FileInfo +import qbs.Host Module { Depends { name: "cpp" } Group { name: "thetool binary" files: FileInfo.cleanPath(FileInfo.joinPaths(path, "..", "..", - "thetool" + (qbs.hostOS.contains("windows") ? ".exe" : ""))); + "thetool" + (Host.os().includes("windows") ? ".exe" : ""))); fileTags: ["thetool.thetool"] filesAreTargets: true } diff --git a/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs b/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs index 575f4020e..ab4e07170 100644 --- a/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs +++ b/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs @@ -1,9 +1,18 @@ +import qbs.Host + Project { CppApplication { name: "thetool" consoleApplication: true files: "main.cpp" + property bool skip: { + var result = qbs.targetPlatform !== Host.platform(); + if (result) + console.info("Skip this test"); + return result; + } + install: true installDir: "" qbs.installPrefix: "" 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(); |