3 files changed, 27 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs b/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs
new file mode 100644
index 000000000..660c088a0
--- /dev/null
+++ b/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs
@@ -0,0 +1,13 @@
+import qbs
+
+Product {
+    name: "p"
+    multiplexByQbsProperties: "buildVariants"
+    qbs.buildVariants: ["debug", "release"]
+    Export {
+        Probe {
+            id: dummy
+            configure: { found = true; }
+        }
+    }
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 844b421c4..4f59eeeed 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -2741,6 +2741,19 @@ void TestBlackbox::probeProperties()
     QVERIFY2(m_qbsStdout.contains("probe2.filePath=" + dir + "/bin/tool"), m_qbsStdout.constData());
 }
 
+void TestBlackbox::probesAndShadowProducts()
+{
+    QDir::setCurrent(testDataDir + "/probes-and-shadow-products");
+    QCOMPARE(runQbs(QStringList("--log-time")), 0);
+    QVERIFY2(m_qbsStdout.contains("2 probes encountered, 1 configure scripts executed"),
+             m_qbsStdout.constData());
+    WAIT_FOR_NEW_TIMESTAMP();
+    touch("probes-and-shadow-products.qbs");
+    QCOMPARE(runQbs(QStringList("--log-time")), 0);
+    QVERIFY2(m_qbsStdout.contains("2 probes encountered, 0 configure scripts executed"),
+             m_qbsStdout.constData());
+}
+
 void TestBlackbox::probeInExportedModule()
 {
     QDir::setCurrent(testDataDir + "/probe-in-exported-module");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 6562e8cbc..44c2e9ca0 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -193,6 +193,7 @@ private slots:
     void preventFloatingPointValues();
     void probeChangeTracking();
     void probeProperties();
+    void probesAndShadowProducts();
     void probeInExportedModule();
     void probesAndArrayProperties();
     void probesInNestedModules();