From ec82b49dfdaab311a3dfcfdbcc4cbace26552417 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 10 May 2026 10:57:35 +0200 Subject: [PATCH] Better report target vs host differences Last-Update: 2026-03-07 Origin: https://code.qt.io/cgit/qbs/qbs.git/commit/?id=a88a68210ef4b9ad9188d2c7897f6216439a4254 Applied-Upstream: 3.3.0, commit:a88a68210ef4b9ad9188d2c7897f6216439a4254 When reporting that the target and the host are not detected as the same (typically in tests, and also in one example), print the actual values of platform+architecture for both target and host. This does not change the behaviour, and rather helps debugging things in case e.g. tests are skipped because of target vs host mismatch (reported as cross-compiling). Gbp-Pq: Name upstream_Better-report-target-vs-host-differences.patch --- examples/code-generator/code-generator.qbs | 4 +++- .../testdata/explicitly-depends-on/explicitly-depends-on.qbs | 4 +++- tests/auto/api/testdata/process-result/process-result.qbs | 4 +++- tests/auto/api/testdata/timeout-process/timeout.qbs | 4 +++- .../tool-in-module/use-within-project/use-within-project.qbs | 4 +++- .../auto/blackbox/testdata-baremetal/BareMetalApplication.qbs | 4 +++- tests/auto/blackbox/testdata-java/java/vehicles.qbs | 4 +++- .../testdata-joblimits/job-limits-init/job-limits-init.qbs | 4 +++- .../testdata-providers/module-providers/module-providers.qbs | 4 +++- tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs | 4 +++- tests/auto/blackbox/testdata-qt/forced-moc/forced-moc.qbs | 4 +++- tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs | 4 +++- tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs | 4 +++- .../testdata-qt/plugin-meta-data/plugin-meta-data.qbs | 4 +++- tests/auto/blackbox/testdata-qt/qdoc/qdoc.qbs | 4 +++- tests/auto/blackbox/testdata-qt/qrc/i.qbs | 4 +++- tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs | 4 +++- .../blackbox/testdata/autotest-timeout/autotests-timeout.qbs | 4 +++- .../autotest-with-dependencies/autotest-with-dependencies.qbs | 4 +++- tests/auto/blackbox/testdata/autotests/autotests.qbs | 4 +++- .../auto/blackbox/testdata/badInterpreter/badInterpreter.qbs | 4 +++- .../blackbox/testdata/capnproto/capnproto_absolute_import.qbs | 4 +++- tests/auto/blackbox/testdata/capnproto/capnproto_cpp.qbs | 4 +++- .../blackbox/testdata/capnproto/capnproto_relative_import.qbs | 4 +++- tests/auto/blackbox/testdata/capnproto/greeter_cpp.qbs | 4 +++- tests/auto/blackbox/testdata/configure/configure.qbs | 4 +++- .../blackbox/testdata/dynamic-library-in-module/theapp.qbs | 4 +++- tests/auto/blackbox/testdata/env-merging/env-merging.qbs | 4 +++- tests/auto/blackbox/testdata/exports-qbs/consumer.qbs | 4 +++- tests/auto/blackbox/testdata/flatbuf/flat_absolute_import.qbs | 4 +++- tests/auto/blackbox/testdata/flatbuf/flat_c.qbs | 4 +++- tests/auto/blackbox/testdata/flatbuf/flat_cpp.qbs | 4 +++- .../blackbox/testdata/flatbuf/flat_filename_extension.qbs | 4 +++- tests/auto/blackbox/testdata/flatbuf/flat_filename_suffix.qbs | 4 +++- tests/auto/blackbox/testdata/flatbuf/flat_keep_prefix.qbs | 4 +++- tests/auto/blackbox/testdata/flatbuf/flat_relative_import.qbs | 4 +++- .../blackbox/testdata/groups-in-modules/groups-in-modules.qbs | 4 +++- tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs | 4 +++- .../testdata/host-os-properties/host-os-properties.qbs | 4 +++- tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs | 4 +++- .../installable-as-auxiliary-input.qbs | 4 +++- tests/auto/blackbox/testdata/jsextensions-process/process.qbs | 4 +++- .../blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs | 4 +++- .../linker-module-definition/linker-module-definition.qbs | 4 +++- .../auto/blackbox/testdata/loadablemodule/loadablemodule.qbs | 4 +++- .../blackbox/testdata/localDeployment/localDeployment.qbs | 4 +++- tests/auto/blackbox/testdata/makefile-generator/app.qbs | 4 +++- .../blackbox/testdata/minimumSystemVersion/fakewindows.qbs | 4 +++- .../blackbox/testdata/minimumSystemVersion/macappstore.qbs | 4 +++- .../auto/blackbox/testdata/minimumSystemVersion/specific.qbs | 4 +++- .../testdata/minimumSystemVersion/unspecified-forced.qbs | 4 +++- .../blackbox/testdata/minimumSystemVersion/unspecified.qbs | 4 +++- .../blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs | 4 +++- tests/auto/blackbox/testdata/nodejs/hello.qbs | 4 +++- .../testdata/protobuf-library-install/protobuf-library.qbs | 4 +++- tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs | 4 +++- tests/auto/blackbox/testdata/protobuf/addressbook_nanopb.qbs | 4 +++- tests/auto/blackbox/testdata/protobuf/addressbook_objc.qbs | 4 +++- .../auto/blackbox/testdata/protobuf/create-proto-library.qbs | 4 +++- tests/auto/blackbox/testdata/protobuf/import.qbs | 4 +++- tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs | 4 +++- .../auto/blackbox/testdata/response-files/response-files.qbs | 4 +++- .../blackbox/testdata/run-multiplexed/run-multiplexed.qbs | 4 +++- .../testdata/setup-run-environment/setup-run-environment.qbs | 4 +++- .../auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs | 4 +++- .../blackbox/testdata/trackAddFile/after/trackAddFile.qbs | 4 +++- .../blackbox/testdata/trackAddFile/before/trackAddFile.qbs | 4 +++- .../blackbox/testdata/trackFileTags/after/trackFileTags.qbs | 4 +++- .../blackbox/testdata/trackFileTags/before/trackFileTags.qbs | 4 +++- tests/auto/blackbox/testdata/vcs/vcstest.qbs | 4 +++- 70 files changed, 210 insertions(+), 70 deletions(-) diff --git a/examples/code-generator/code-generator.qbs b/examples/code-generator/code-generator.qbs index b971b722..fd5e4b2c 100644 --- a/examples/code-generator/code-generator.qbs +++ b/examples/code-generator/code-generator.qbs @@ -67,7 +67,9 @@ Project { && (qbs.architecture === qbs.hostArchitecture || (qbs.architecture === "x86" && qbs.hostArchitecture === "x86_64")); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + qbs.hostPlatform + "/" + qbs.hostArchitecture + ")"); return result; } name: "hello-world" 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 79ed579e..6f0aa218 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 @@ -15,7 +15,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "p" diff --git a/tests/auto/api/testdata/process-result/process-result.qbs b/tests/auto/api/testdata/process-result/process-result.qbs index e2840fab..a5f9fdee 100644 --- a/tests/auto/api/testdata/process-result/process-result.qbs +++ b/tests/auto/api/testdata/process-result/process-result.qbs @@ -10,7 +10,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "app-caller" diff --git a/tests/auto/api/testdata/timeout-process/timeout.qbs b/tests/auto/api/testdata/timeout-process/timeout.qbs index c7f29364..81d56366 100644 --- a/tests/auto/api/testdata/timeout-process/timeout.qbs +++ b/tests/auto/api/testdata/timeout-process/timeout.qbs @@ -18,7 +18,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } type: "product-under-test" 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 86441bb8..5f2e3dcd 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 @@ -9,7 +9,9 @@ Project { property bool skip: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs index fe9edebe..08a1efc3 100644 --- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs +++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs @@ -17,7 +17,9 @@ BareMetalProduct { } if (!supportsCrossRun()) - console.info("target platform/arch differ from host platform/arch") + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); } } diff --git a/tests/auto/blackbox/testdata-java/java/vehicles.qbs b/tests/auto/blackbox/testdata-java/java/vehicles.qbs index e009ab71..e1119b66 100644 --- a/tests/auto/blackbox/testdata-java/java/vehicles.qbs +++ b/tests/auto/blackbox/testdata-java/java/vehicles.qbs @@ -14,7 +14,9 @@ Project { property bool _testPlatform: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } diff --git a/tests/auto/blackbox/testdata-joblimits/job-limits-init/job-limits-init.qbs b/tests/auto/blackbox/testdata-joblimits/job-limits-init/job-limits-init.qbs index d0f7c109..589e649a 100644 --- a/tests/auto/blackbox/testdata-joblimits/job-limits-init/job-limits-init.qbs +++ b/tests/auto/blackbox/testdata-joblimits/job-limits-init/job-limits-init.qbs @@ -4,7 +4,9 @@ Product { property bool _testPlatform: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } } diff --git a/tests/auto/blackbox/testdata-providers/module-providers/module-providers.qbs b/tests/auto/blackbox/testdata-providers/module-providers/module-providers.qbs index 6d331b52..1b220611 100644 --- a/tests/auto/blackbox/testdata-providers/module-providers/module-providers.qbs +++ b/tests/auto/blackbox/testdata-providers/module-providers/module-providers.qbs @@ -4,7 +4,9 @@ Project { property bool dummy: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } readonly property string beginning: "beginning" diff --git a/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs b/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs index d32e35a4..60ddd1a0 100644 --- a/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs +++ b/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs @@ -5,7 +5,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } diff --git a/tests/auto/blackbox/testdata-qt/forced-moc/forced-moc.qbs b/tests/auto/blackbox/testdata-qt/forced-moc/forced-moc.qbs index 927c319c..a6eef31a 100644 --- a/tests/auto/blackbox/testdata-qt/forced-moc/forced-moc.qbs +++ b/tests/auto/blackbox/testdata-qt/forced-moc/forced-moc.qbs @@ -9,7 +9,9 @@ QtApplication { } var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } files: "main.cpp" diff --git a/tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs b/tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs index 28daaba2..4c8e6bfb 100644 --- a/tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs +++ b/tests/auto/blackbox/testdata-qt/lrelease/lrelease.qbs @@ -4,7 +4,9 @@ Product { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } diff --git a/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs b/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs index 52bc79d8..2981b8b5 100644 --- a/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs +++ b/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs @@ -7,7 +7,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: project.name diff --git a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs index 8e4e3bcf..eb930484 100644 --- a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs +++ b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs @@ -11,7 +11,9 @@ Project { } var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } diff --git a/tests/auto/blackbox/testdata-qt/qdoc/qdoc.qbs b/tests/auto/blackbox/testdata-qt/qdoc/qdoc.qbs index 2f894527..debe5321 100644 --- a/tests/auto/blackbox/testdata-qt/qdoc/qdoc.qbs +++ b/tests/auto/blackbox/testdata-qt/qdoc/qdoc.qbs @@ -8,7 +8,9 @@ Product { return false; } if (qbs.targetPlatform !== Host.platform() || qbs.architecture !== Host.architecture()) { - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return false; } return true; diff --git a/tests/auto/blackbox/testdata-qt/qrc/i.qbs b/tests/auto/blackbox/testdata-qt/qrc/i.qbs index 0abe9497..b6e3fce6 100644 --- a/tests/auto/blackbox/testdata-qt/qrc/i.qbs +++ b/tests/auto/blackbox/testdata-qt/qrc/i.qbs @@ -10,7 +10,9 @@ Project { } var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); console.info("executable suffix: " + cpp.executableSuffix); return result; } diff --git a/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs b/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs index c09bcdda..f9d244f0 100644 --- a/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs +++ b/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs @@ -28,7 +28,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "runner" diff --git a/tests/auto/blackbox/testdata/autotest-timeout/autotests-timeout.qbs b/tests/auto/blackbox/testdata/autotest-timeout/autotests-timeout.qbs index 94715160..1d0b1923 100644 --- a/tests/auto/blackbox/testdata/autotest-timeout/autotests-timeout.qbs +++ b/tests/auto/blackbox/testdata/autotest-timeout/autotests-timeout.qbs @@ -5,7 +5,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "testApp" diff --git a/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs b/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs index bff3e721..d804e611 100644 --- a/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs +++ b/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs @@ -6,7 +6,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "helper-app" diff --git a/tests/auto/blackbox/testdata/autotests/autotests.qbs b/tests/auto/blackbox/testdata/autotests/autotests.qbs index c237cd40..a678712c 100644 --- a/tests/auto/blackbox/testdata/autotests/autotests.qbs +++ b/tests/auto/blackbox/testdata/autotests/autotests.qbs @@ -6,7 +6,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } Depends { diff --git a/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs b/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs index d1f99dc4..b0854966 100644 --- a/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs +++ b/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs @@ -4,7 +4,9 @@ Project { property bool dummy: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } diff --git a/tests/auto/blackbox/testdata/capnproto/capnproto_absolute_import.qbs b/tests/auto/blackbox/testdata/capnproto/capnproto_absolute_import.qbs index f9dcb729..98dcf45c 100644 --- a/tests/auto/blackbox/testdata/capnproto/capnproto_absolute_import.qbs +++ b/tests/auto/blackbox/testdata/capnproto/capnproto_absolute_import.qbs @@ -5,7 +5,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); if (!capnproto.cpp.present) console.info("capnproto is not present"); return result && capnproto.cpp.present; diff --git a/tests/auto/blackbox/testdata/capnproto/capnproto_cpp.qbs b/tests/auto/blackbox/testdata/capnproto/capnproto_cpp.qbs index 65957d6e..abb9abeb 100644 --- a/tests/auto/blackbox/testdata/capnproto/capnproto_cpp.qbs +++ b/tests/auto/blackbox/testdata/capnproto/capnproto_cpp.qbs @@ -5,7 +5,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); if (!capnproto.cpp.present) console.info("capnproto is not present"); return result && capnproto.cpp.present; diff --git a/tests/auto/blackbox/testdata/capnproto/capnproto_relative_import.qbs b/tests/auto/blackbox/testdata/capnproto/capnproto_relative_import.qbs index 14e06751..da8c7bd8 100644 --- a/tests/auto/blackbox/testdata/capnproto/capnproto_relative_import.qbs +++ b/tests/auto/blackbox/testdata/capnproto/capnproto_relative_import.qbs @@ -5,7 +5,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); if (!capnproto.cpp.present) console.info("capnproto is not present"); return result && capnproto.cpp.present; diff --git a/tests/auto/blackbox/testdata/capnproto/greeter_cpp.qbs b/tests/auto/blackbox/testdata/capnproto/greeter_cpp.qbs index dd199a2a..7eab7734 100644 --- a/tests/auto/blackbox/testdata/capnproto/greeter_cpp.qbs +++ b/tests/auto/blackbox/testdata/capnproto/greeter_cpp.qbs @@ -6,7 +6,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); if (!capnproto.cpp.present) console.info("capnproto is not present"); return result && capnproto.cpp.present; diff --git a/tests/auto/blackbox/testdata/configure/configure.qbs b/tests/auto/blackbox/testdata/configure/configure.qbs index 63377302..aa2330c4 100644 --- a/tests/auto/blackbox/testdata/configure/configure.qbs +++ b/tests/auto/blackbox/testdata/configure/configure.qbs @@ -5,7 +5,9 @@ Project { property bool enabled: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } property string name: 'configure' diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs index a998de05..5ac85668 100644 --- a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs +++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs @@ -5,7 +5,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "theapp" diff --git a/tests/auto/blackbox/testdata/env-merging/env-merging.qbs b/tests/auto/blackbox/testdata/env-merging/env-merging.qbs index aacfaf61..4d2465e5 100644 --- a/tests/auto/blackbox/testdata/env-merging/env-merging.qbs +++ b/tests/auto/blackbox/testdata/env-merging/env-merging.qbs @@ -10,7 +10,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "p" diff --git a/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs b/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs index 31194948..2137e62f 100644 --- a/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs +++ b/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs @@ -6,7 +6,9 @@ CppApplication { // if cpp module is not available, we can't check the architecture && (qbs.architecture === undefined || qbs.architecture === Host.architecture()); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "consumer" diff --git a/tests/auto/blackbox/testdata/flatbuf/flat_absolute_import.qbs b/tests/auto/blackbox/testdata/flatbuf/flat_absolute_import.qbs index 30ff4472..dde48cb7 100644 --- a/tests/auto/blackbox/testdata/flatbuf/flat_absolute_import.qbs +++ b/tests/auto/blackbox/testdata/flatbuf/flat_absolute_import.qbs @@ -7,7 +7,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasFlatbuffers; } property bool hasFlatbuffers: { diff --git a/tests/auto/blackbox/testdata/flatbuf/flat_c.qbs b/tests/auto/blackbox/testdata/flatbuf/flat_c.qbs index eb897242..324873ae 100644 --- a/tests/auto/blackbox/testdata/flatbuf/flat_c.qbs +++ b/tests/auto/blackbox/testdata/flatbuf/flat_c.qbs @@ -6,7 +6,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasFlatbuffers; } property bool hasFlatbuffers: { diff --git a/tests/auto/blackbox/testdata/flatbuf/flat_cpp.qbs b/tests/auto/blackbox/testdata/flatbuf/flat_cpp.qbs index 838c1299..ea0437fd 100644 --- a/tests/auto/blackbox/testdata/flatbuf/flat_cpp.qbs +++ b/tests/auto/blackbox/testdata/flatbuf/flat_cpp.qbs @@ -7,7 +7,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasFlatbuffers; } property bool hasFlatbuffers: { diff --git a/tests/auto/blackbox/testdata/flatbuf/flat_filename_extension.qbs b/tests/auto/blackbox/testdata/flatbuf/flat_filename_extension.qbs index 8eee21d9..fbcdd6b0 100644 --- a/tests/auto/blackbox/testdata/flatbuf/flat_filename_extension.qbs +++ b/tests/auto/blackbox/testdata/flatbuf/flat_filename_extension.qbs @@ -6,7 +6,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasFlatbuffers; } property bool hasFlatbuffers: { diff --git a/tests/auto/blackbox/testdata/flatbuf/flat_filename_suffix.qbs b/tests/auto/blackbox/testdata/flatbuf/flat_filename_suffix.qbs index 609d1d63..7cd557cc 100644 --- a/tests/auto/blackbox/testdata/flatbuf/flat_filename_suffix.qbs +++ b/tests/auto/blackbox/testdata/flatbuf/flat_filename_suffix.qbs @@ -6,7 +6,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasFlatbuffers; } property bool hasFlatbuffers: { diff --git a/tests/auto/blackbox/testdata/flatbuf/flat_keep_prefix.qbs b/tests/auto/blackbox/testdata/flatbuf/flat_keep_prefix.qbs index dac62f16..a3c495e9 100644 --- a/tests/auto/blackbox/testdata/flatbuf/flat_keep_prefix.qbs +++ b/tests/auto/blackbox/testdata/flatbuf/flat_keep_prefix.qbs @@ -6,7 +6,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasFlatbuffers; } property bool hasFlatbuffers: { diff --git a/tests/auto/blackbox/testdata/flatbuf/flat_relative_import.qbs b/tests/auto/blackbox/testdata/flatbuf/flat_relative_import.qbs index dc1f515b..e98dfde8 100644 --- a/tests/auto/blackbox/testdata/flatbuf/flat_relative_import.qbs +++ b/tests/auto/blackbox/testdata/flatbuf/flat_relative_import.qbs @@ -7,7 +7,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasFlatbuffers; } property bool hasFlatbuffers: { diff --git a/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs b/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs index ce1076a3..779a70fc 100644 --- a/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs +++ b/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs @@ -5,7 +5,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } Depends { name: "dep" } diff --git a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs index df3d566b..5fa82426 100644 --- a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs +++ b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs @@ -6,7 +6,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasDependencies; } diff --git a/tests/auto/blackbox/testdata/host-os-properties/host-os-properties.qbs b/tests/auto/blackbox/testdata/host-os-properties/host-os-properties.qbs index a3358f32..57a84c51 100644 --- a/tests/auto/blackbox/testdata/host-os-properties/host-os-properties.qbs +++ b/tests/auto/blackbox/testdata/host-os-properties/host-os-properties.qbs @@ -4,7 +4,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } consoleApplication: true diff --git a/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs b/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs index 205cc8ee..01a2e3b7 100644 --- a/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs +++ b/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs @@ -8,7 +8,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } type: 'application' 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 6ebf6055..13538cdc 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 @@ -9,7 +9,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "app" diff --git a/tests/auto/blackbox/testdata/jsextensions-process/process.qbs b/tests/auto/blackbox/testdata/jsextensions-process/process.qbs index b15ac98a..208f7558 100644 --- a/tests/auto/blackbox/testdata/jsextensions-process/process.qbs +++ b/tests/auto/blackbox/testdata/jsextensions-process/process.qbs @@ -9,7 +9,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs b/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs index 5cfe5c56..7bb95d7b 100644 --- a/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs +++ b/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs @@ -4,7 +4,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); console.info("executable suffix: " + cpp.executableSuffix); return result; } diff --git a/tests/auto/blackbox/testdata/linker-module-definition/linker-module-definition.qbs b/tests/auto/blackbox/testdata/linker-module-definition/linker-module-definition.qbs index 6bf5556e..c0ed50fc 100644 --- a/tests/auto/blackbox/testdata/linker-module-definition/linker-module-definition.qbs +++ b/tests/auto/blackbox/testdata/linker-module-definition/linker-module-definition.qbs @@ -5,7 +5,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "testapp" diff --git a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs index 16b8da6a..2c858cda 100644 --- a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs +++ b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs @@ -20,7 +20,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs b/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs index 41f15f6c..36051e6b 100644 --- a/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs +++ b/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs @@ -5,7 +5,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } type: ["application"] diff --git a/tests/auto/blackbox/testdata/makefile-generator/app.qbs b/tests/auto/blackbox/testdata/makefile-generator/app.qbs index 2e0a99b0..7128d6c8 100644 --- a/tests/auto/blackbox/testdata/makefile-generator/app.qbs +++ b/tests/auto/blackbox/testdata/makefile-generator/app.qbs @@ -4,7 +4,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); console.info("executable suffix: " + cpp.executableSuffix); return result; } diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs index f815862d..15fe87d8 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs @@ -8,7 +8,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && qbs.targetOS.includes("windows"); } files: ["main.cpp"] diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs index 2f6ae533..10bf722e 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs @@ -7,7 +7,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && qbs.targetOS.includes("macos"); } files: ["main.mm"] diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs index 8bf6c0c1..ab613d77 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs @@ -9,7 +9,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && qbs.targetOS.includes("windows") || qbs.targetOS.includes("macos"); } files: [qbs.targetOS.includes("darwin") ? "main.mm" : "main.cpp"] diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs index 9ca90bf3..bbf771c2 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs @@ -8,7 +8,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } files: [qbs.targetOS.includes("darwin") ? "main.mm" : "main.cpp"] diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs index 1a67fbe6..60d4ca15 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs @@ -7,7 +7,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } files: [qbs.targetOS.includes("darwin") ? "main.mm" : "main.cpp"] diff --git a/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs b/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs index 3f7a7114..ce82029c 100644 --- a/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs +++ b/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs @@ -13,7 +13,9 @@ Project { property bool _testPlatform: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } Profile { diff --git a/tests/auto/blackbox/testdata/nodejs/hello.qbs b/tests/auto/blackbox/testdata/nodejs/hello.qbs index 07a0fd58..591d000f 100644 --- a/tests/auto/blackbox/testdata/nodejs/hello.qbs +++ b/tests/auto/blackbox/testdata/nodejs/hello.qbs @@ -4,7 +4,9 @@ NodeJSApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } nodejs.applicationFile: "hello.js" diff --git a/tests/auto/blackbox/testdata/protobuf-library-install/protobuf-library.qbs b/tests/auto/blackbox/testdata/protobuf-library-install/protobuf-library.qbs index 3bcef83d..2fcb1e66 100644 --- a/tests/auto/blackbox/testdata/protobuf-library-install/protobuf-library.qbs +++ b/tests/auto/blackbox/testdata/protobuf-library-install/protobuf-library.qbs @@ -4,7 +4,9 @@ StaticLibrary { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasProtobuf; } diff --git a/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs b/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs index ddc8cae6..6bc2e120 100644 --- a/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs +++ b/tests/auto/blackbox/testdata/protobuf/addressbook_cpp.qbs @@ -4,7 +4,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasProtobuf; } name: "addressbook_cpp" diff --git a/tests/auto/blackbox/testdata/protobuf/addressbook_nanopb.qbs b/tests/auto/blackbox/testdata/protobuf/addressbook_nanopb.qbs index cb6fee11..6467f412 100644 --- a/tests/auto/blackbox/testdata/protobuf/addressbook_nanopb.qbs +++ b/tests/auto/blackbox/testdata/protobuf/addressbook_nanopb.qbs @@ -4,7 +4,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasProtobuf; } name: "addressbook_nanopb" diff --git a/tests/auto/blackbox/testdata/protobuf/addressbook_objc.qbs b/tests/auto/blackbox/testdata/protobuf/addressbook_objc.qbs index cf450846..32e6a7c6 100644 --- a/tests/auto/blackbox/testdata/protobuf/addressbook_objc.qbs +++ b/tests/auto/blackbox/testdata/protobuf/addressbook_objc.qbs @@ -4,7 +4,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasProtobuf; } name: "addressbook_objc" diff --git a/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs b/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs index 9b375fd5..918f0aeb 100644 --- a/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs +++ b/tests/auto/blackbox/testdata/protobuf/create-proto-library.qbs @@ -5,7 +5,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasProtobuf; } name: "proto_lib" diff --git a/tests/auto/blackbox/testdata/protobuf/import.qbs b/tests/auto/blackbox/testdata/protobuf/import.qbs index 0ddb831a..7c224f38 100644 --- a/tests/auto/blackbox/testdata/protobuf/import.qbs +++ b/tests/auto/blackbox/testdata/protobuf/import.qbs @@ -4,7 +4,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasProtobuf; } name: "app" diff --git a/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs b/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs index ac12c3cc..25f4c4d6 100644 --- a/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs +++ b/tests/auto/blackbox/testdata/protobuf/needs-import-dir.qbs @@ -4,7 +4,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result && hasProtobuf; } name: "app" diff --git a/tests/auto/blackbox/testdata/response-files/response-files.qbs b/tests/auto/blackbox/testdata/response-files/response-files.qbs index ac3f0fa2..1f39b686 100644 --- a/tests/auto/blackbox/testdata/response-files/response-files.qbs +++ b/tests/auto/blackbox/testdata/response-files/response-files.qbs @@ -12,7 +12,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "response-file-text" diff --git a/tests/auto/blackbox/testdata/run-multiplexed/run-multiplexed.qbs b/tests/auto/blackbox/testdata/run-multiplexed/run-multiplexed.qbs index 38dce6a4..e8b6d3f7 100644 --- a/tests/auto/blackbox/testdata/run-multiplexed/run-multiplexed.qbs +++ b/tests/auto/blackbox/testdata/run-multiplexed/run-multiplexed.qbs @@ -17,7 +17,9 @@ CppApplication { configure: { var result = targetPlatform === Host.platform() && targetArchitecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + targetPlatform + "/" + targetArchitecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); } } } diff --git a/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs b/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs index 73f4d419..17a3b71e 100644 --- a/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs +++ b/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs @@ -93,7 +93,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: "app" diff --git a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs index 989118a1..eed1bfd3 100644 --- a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs +++ b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs @@ -9,7 +9,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } Depends { name: "cpp" } diff --git a/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs b/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs index 58f27c7f..2e179ed3 100644 --- a/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs +++ b/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs @@ -4,7 +4,9 @@ Product { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: 'someapp' diff --git a/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs b/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs index af11c027..b2990178 100644 --- a/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs +++ b/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs @@ -4,7 +4,9 @@ Product { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: 'someapp' diff --git a/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs b/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs index 6a4349ae..38160048 100644 --- a/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs +++ b/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs @@ -7,7 +7,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: 'someapp' diff --git a/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs b/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs index 1a1ea355..abe0d4d2 100644 --- a/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs +++ b/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs @@ -7,7 +7,9 @@ Project { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } name: 'someapp' diff --git a/tests/auto/blackbox/testdata/vcs/vcstest.qbs b/tests/auto/blackbox/testdata/vcs/vcstest.qbs index a331391d..bd877dce 100644 --- a/tests/auto/blackbox/testdata/vcs/vcstest.qbs +++ b/tests/auto/blackbox/testdata/vcs/vcstest.qbs @@ -4,7 +4,9 @@ CppApplication { condition: { var result = qbs.targetPlatform === Host.platform() && qbs.architecture === Host.architecture(); if (!result) - console.info("target platform/arch differ from host platform/arch"); + console.info("target platform/arch differ from host platform/arch (" + + qbs.targetPlatform + "/" + qbs.architecture + " vs " + + Host.platform() + "/" + Host.architecture() + ")"); return result; } Depends { name: "vcs" } -- 2.30.2