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

diff --git a/examples/code-generator/code-generator.qbs b/examples/code-generator/code-generator.qbs
index b971b722e15da9e468a278fd14c089e6681561aa..fd5e4b2c79f379e47c2b4cb6b5d9b714569dd4d5 100644 (file)
--- 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 79ed579e31a04ea7bdd93e82bd06f3d50b1c12cb..6f0aa218727f862257245e78da5bca2e76d17700 100644 (file)
--- 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 e2840fab7e9e44b0c22d11638c2461d930f2c1f8..a5f9fdee2d769c071770ad31d9ec3a3af9a25bb7 100644 (file)
--- 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 c7f29364b036b1e36fb63e7dd41627e00639d80d..81d563669cc6cc3679d40da83440d3ffff2c9bd0 100644 (file)
--- 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 86441bb800f8840a3aa9b23f9a8bc4056cbdf43c..5f2e3dcd45f63deddc00341d5b628e49494a9891 100644 (file)
--- 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 fe9edebe168c5ce7209990b66c0dc50aaffb660a..08a1efc3b3883159907fc18a2e05b8e8e7c2dfbf 100644 (file)
--- 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 e009ab717a717b36cbd1939ef7ef8c4c9a0f5b26..e1119b66dda63850ac1f4ce6fd8e4b652fc0168d 100644 (file)
--- 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 d0f7c109283f4b385a5c7c7e96bf6efeb838806a..589e649a22a050831663de7663e1cd032db80b21 100644 (file)
--- 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 6d331b52d9cc384b03b388b240e20e4f242cbe64..1b22061103feddebe8d3344f917c40f8a93eb3d4 100644 (file)
--- 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 d32e35a4240fac48371a25e73186ca8b98c8d332..60ddd1a0431c85ec294653ae55d8f4c1102009b9 100644 (file)
--- 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 927c319c2de7817e05ef7ad91450e1a7121a2c18..a6eef31a6f6f4c3352a4ed7d0e3d40281ab895f2 100644 (file)
--- 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 28daaba2bd1b21bef9f08cbe3f27c9ee7927618b..4c8e6bfbb52fe47340ca0f219fb951479f26e203 100644 (file)
--- 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 52bc79d81fa99eb91c4301cee22682e63486da15..2981b8b5701251ea28865f19c3ecbfb0bb06dbcb 100644 (file)
--- 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 8e4e3bcfa5735862cee6c2a8250a8ba16c2608ba..eb930484b1de5f29f48b8e4f39b7c9101ec3bc7d 100644 (file)
--- 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 2f8945276097f1df95bf5cc4ec4445cba1f44b85..debe53219240642ac1990295771eabcedc157b32 100644 (file)
--- 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 0abe949730763b6fb548a59e4f806995196ff48e..b6e3fce60d9105b55ab2cd3c227d1c10e11b275c 100644 (file)
--- 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 c09bcddab2b411bf00bdf786d7f54e919ceee4df..f9d244f01e93b83f0f5208ac66659dedeebf5930 100644 (file)
--- 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 947151600683585528d6e5253b9a5b744b8ea2b3..1d0b192322f453f4ddd9ba0486600d9a801861da 100644 (file)
--- 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 bff3e7218e2d30bdd4b41555779cfd54377fd2a6..d804e611813588713487d38821367985122ac3ae 100644 (file)
--- 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 c237cd40e1680a5e8cb14f0bb8684c34492b4805..a678712c5e88aff307a25c57b9d54f0164cca601 100644 (file)
--- 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 d1f99dc487532f8d6be1f17655756ff233c40fa5..b085496638f0aa9c920b86e6dedfb490706b3be9 100644 (file)
--- 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 f9dcb729e4096375868a305c9c88a834d36d92ab..98dcf45c520cf7e32f930f75ca051e64539b60df 100644 (file)
--- 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 65957d6e099ee8592ef42e4459e0ab28f0e4f209..abb9abeb5ae9674b1c58bb7553589625a64f7ab9 100644 (file)
--- 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 14e06751c6d55b13aa16015bd4738aa71aa53768..da8c7bd85553c0fc0b6ce65c5c1b0c1b2054a476 100644 (file)
--- 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 dd199a2aeda956a100806795564712702cf2f79c..7eab773471aa6401fc63d878751255ca7a7e0a71 100644 (file)
--- 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 6337730253584f0afb0b2a597e9171d38548797f..aa2330c4f6abce2cdc739fe252f5bc64352a00eb 100644 (file)
--- 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 a998de05880632bdd9b0ceac153c6cd60517080e..5ac856680b51eb4ab8681f0edcf9a25f203eaba5 100644 (file)
--- 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 aacfaf6139a6227a8236ed0af3f757c22050e298..4d2465e5510b11d73debb07ae9847a8723862ad8 100644 (file)
--- 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 311949481f35f85b33289ed1426cea3ad64ae89a..2137e62fa999c1b9fee13a859d1a045f3d2bb758 100644 (file)
--- 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 30ff4472119ebab74d6a7fbe5c13b436ba808e89..dde48cb74df4765b3a055f49cc43e4166aba4661 100644 (file)
--- 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 eb897242e79dcd3a961b63882697e51d4fccd75a..324873aef6c4c03e9dbaa206f79051b4d2642600 100644 (file)
--- 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 838c1299bba6a78629500a2b88f9493a81681736..ea0437fd66e6920ea9902ad55d9d6165e629a75b 100644 (file)
--- 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 8eee21d95380f333c1671c0768d0beb968d15976..fbcdd6b021b2e5ff4060ef94d36ab72d0b6c8b2c 100644 (file)
--- 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 609d1d6346a46aa768fb70d3e0a084647a2c0f93..7cd557cc1250b7e756d24acd15100c90dd80a174 100644 (file)
--- 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 dac62f16d4d102834eab7e41ffb4e1e041afb16a..a3c495e91cf4bab08da6596390d3665bd9ecdba5 100644 (file)
--- 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 dc1f515bd6cc810e786b54100c03fcae2316220e..e98dfde8d557631605b66ad9da33ab25aaa3ea74 100644 (file)
--- 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 ce1076a391d9b582d024b359571cf3c2b03252b5..779a70fc4f0ac8eddf919d6ad27b072e685b03f2 100644 (file)
--- 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 df3d566be7d42bbc751b14d0d8fcb45f8668aab7..5fa824261bc9800bd3728fa2ddf953a46450d56a 100644 (file)
--- 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 a3358f323fd4af81bb9b3d3a400205eaf016c4f3..57a84c5166d56a0d0a7a3a68edbc02ef01a57100 100644 (file)
--- 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 205cc8ee15beb1fae192ccbc568a4d0b12403da8..01a2e3b77adafec68b83e5cd7f2c059e0906b11e 100644 (file)
--- 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 6ebf6055958059e719bd1c802dad20a10d7ad0b1..13538cdc1b7f95262ee97cae246f5626deb36361 100644 (file)
--- 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 b15ac98adfceec7ca023f33c56276193f218182e..208f7558ba7f39dcc022e6150f9c3753de9f1823 100644 (file)
--- 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 5cfe5c56b860e5e57e1eb71d74b9ddd9da82664e..7bb95d7b838aa23b41f054e7610a1dc0509cb4ff 100644 (file)
--- 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 6bf5556e907a44a928c7b348d81e46245d8a31fe..c0ed50fc95b34239bfa148a4e9d47a870d180da8 100644 (file)
--- 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 16b8da6aadd27f9efe0b5ae269791d88f35931f6..2c858cda1b11a5e92f684ea06f4ee74ff6f80416 100644 (file)
--- 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 41f15f6c66cfcbf2702b5a5c680ae7a83f3a055e..36051e6ba50ab30bd0d0760e97ce16eeceebcb35 100644 (file)
--- 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 2e0a99b008fdddf874722fe0f38092bbb396504a..7128d6c8494cfb9c01811901603ddedc314ee7af 100644 (file)
--- 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 f815862d846806fd86f3e99527c9b2118ec456ce..15fe87d840c8a89561415780c0d48c1b7356143b 100644 (file)
--- 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 2f6ae5337d2e1d80c074fe0cf393195b628517c4..10bf722ec1b4d7aa180b4bbe14ebb6fe917b4e90 100644 (file)
--- 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 8bf6c0c198424915fbb8d16c69a614b08aa8145a..ab613d77c082b7be873e082b1c7d75c83cd47be7 100644 (file)
--- 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 9ca90bf3c75384a01661284a9d8313ee570c70f1..bbf771c2b03e2c7eac91a235af94b55ede6634e0 100644 (file)
--- 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 1a67fbe6a7d7a9b6d0365e84160a4d8806aac1a5..60d4ca157c026010d71dbae430da51373b1cfa7c 100644 (file)
--- 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 3f7a711440492946f043be4af349664f90324c1c..ce82029c225e8e4404388f16c88b126eb2ba733e 100644 (file)
--- 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 07a0fd58fa391f259334b5dbda6417080188c7b3..591d000f83eaca90103396978d4ddd3437da4aa3 100644 (file)
--- 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 3bcef83d2babc0542ed5b98175418c30ee173da7..2fcb1e66515b255a2a8d5ab89f8cd5006c45270a 100644 (file)
--- 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 ddc8cae66e168e6b8ed30391f3ce015e008cdcd7..6bc2e120671b5a95e531f863acee1dec68aa4540 100644 (file)
--- 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 cb6fee1183deec824c15c6eeebb14ca6723e7df6..6467f4121cb2f0e3d21e61de8fbce1e27ecdcfda 100644 (file)
--- 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 cf45084612c5d1c37b4abc45f5067b97559cb99f..32e6a7c60d3bd7651400a035ca3fbf1f7b22a51d 100644 (file)
--- 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 9b375fd5b2ad16dd501b44cf79af7a258b32fee4..918f0aeb5bb3ad7c3b869bd01d2948875fdf1cec 100644 (file)
--- 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 0ddb831a5f4420d98ff275b54c9ce56a875f8ff9..7c224f388388d6b0a2795814f17f4429768c1ce3 100644 (file)
--- 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 ac12c3cc45e405577c00552ebe7567073abc1a37..25f4c4d60b85eb7c14b037554ee949079c596d01 100644 (file)
--- 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 ac3f0fa21ee2fe21df15efcd689f80207aeb30da..1f39b686480bb08eb76884cb020a5e964c53d278 100644 (file)
--- 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 38dce6a49e5851dbd8f5d406861f7608a97e1363..e8b6d3f7ead8f6c1940463c313f18c7e45e41558 100644 (file)
--- 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 73f4d419ed9fffd3f08583dd6c8d2bf453dc7bc2..17a3b71e894d82753ff265040deabcfc3c652029 100644 (file)
--- 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 989118a19c8fc7e29ef66376260e6cd23f748246..eed1bfd33a26e2c46b805cfe2b1090a5630481db 100644 (file)
--- 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 58f27c7f395416ec56b053e74862688b0de457c2..2e179ed3978320d93e89f13de7ba3d37e23a09e5 100644 (file)
--- 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 af11c027f17c1d7dd4580cc90a969a61de2c6c31..b29901789d090cc207731319c2763439b5245c0f 100644 (file)
--- 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 6a4349aecfb352c2bbf67abae176273cf4b72629..38160048369037c46eaa6c9702dbde75c631265e 100644 (file)
--- 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 1a1ea355f7cbc4d2943557d81ab10e0f828a5253..abe0d4d277b5b2070d18779b140fc43c6d3cd4a9 100644 (file)
--- 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 a331391dcbb4deabf265004267fd13e04f003182..bd877dcef3234612cd7b6fe5cb6456583c4ad088 100644 (file)
--- 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" }