Use full product names in command line frontend

Fixes: QBS-1207
Change-Id: I92cbca8d2842e843670f27a358b19dfe6006afbc
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

4 files changed, 42 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/run-multiplexed/main.cpp b/tests/auto/blackbox/testdata/run-multiplexed/main.cpp
new file mode 100644
index 000000000..237c8ce18
--- /dev/null
+++ b/tests/auto/blackbox/testdata/run-multiplexed/main.cpp
@@ -0,0 +1 @@
+int main() {}
diff --git a/tests/auto/blackbox/testdata/run-multiplexed/run-multiplexed.qbs b/tests/auto/blackbox/testdata/run-multiplexed/run-multiplexed.qbs
new file mode 100644
index 000000000..11577b54a
--- /dev/null
+++ b/tests/auto/blackbox/testdata/run-multiplexed/run-multiplexed.qbs
@@ -0,0 +1,21 @@
+import qbs.Host
+
+CppApplication {
+    aggregate: false
+    consoleApplication: true
+    name: "app"
+    multiplexByQbsProperties: "buildVariants"
+
+    qbs.buildVariants: ["debug", "release"]
+
+    files: "main.cpp"
+
+    Probe {
+        id: checker
+        property string targetPlatform: qbs.targetPlatform
+        configure: {
+            if (targetPlatform !== Host.platform())
+                console.info("targetPlatform differs from hostPlatform");
+        }
+    }
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 2befc8db8..f8a037766 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -2741,6 +2741,25 @@ void TestBlackbox::ruleWithNonRequiredInputs()
     QVERIFY2(m_qbsStdout.contains("generating"), m_qbsStdout.constData());
 }
 
+void TestBlackbox::runMultiplexed()
+{
+    QDir::setCurrent(testDataDir + "/run-multiplexed");
+    QCOMPARE(runQbs({"resolve"}), 0);
+    if (m_qbsStdout.contains("targetPlatform differs from hostPlatform"))
+        QSKIP("Cannot run binaries in cross-compiled build");
+
+    QbsRunParameters params("run");
+    params.expectFailure = true;
+    QVERIFY(runQbs(params) != 0);
+    params.arguments = QStringList{"-p", "app"};
+    QVERIFY(runQbs(params) != 0);
+    params.expectFailure = false;
+    params.arguments.last() = "app {\"buildVariant\":\"debug\"}";
+    QCOMPARE(runQbs(params), 0);
+    params.arguments.last() = "app {\"buildVariant\":\"release\"}";
+    QCOMPARE(runQbs(params), 0);
+}
+
 void TestBlackbox::sanitizer_data()
 {
     QTest::addColumn<QString>("sanitizer");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index e405c3c0e..c662395e3 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -286,6 +286,7 @@ private slots:
     void ruleCycle();
     void ruleWithNoInputs();
     void ruleWithNonRequiredInputs();
+    void runMultiplexed();
     void sanitizer_data();
     void sanitizer();
     void scannerItem();