Add XFAIL-ing autotest for newly discovered bug

Task-number: QBS-1532
Change-Id: I54480b044610fc5018938866700e6ba53ce05f15
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

9 files changed, 69 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/scan-result-in-other-product/app/app.h b/tests/auto/blackbox/testdata/scan-result-in-other-product/app/app.h
new file mode 100644
index 000000000..a82b12fbd
--- /dev/null
+++ b/tests/auto/blackbox/testdata/scan-result-in-other-product/app/app.h
@@ -0,0 +1 @@
+#include "lib.h"
diff --git a/tests/auto/blackbox/testdata/scan-result-in-other-product/app/app.qbs b/tests/auto/blackbox/testdata/scan-result-in-other-product/app/app.qbs
new file mode 100644
index 000000000..984e9aca9
--- /dev/null
+++ b/tests/auto/blackbox/testdata/scan-result-in-other-product/app/app.qbs
@@ -0,0 +1,4 @@
+CppApplication {
+    Depends { name: "lib" }
+    files: "main.cpp"
+}
diff --git a/tests/auto/blackbox/testdata/scan-result-in-other-product/app/main.cpp b/tests/auto/blackbox/testdata/scan-result-in-other-product/app/main.cpp
new file mode 100644
index 000000000..2e7bedac8
--- /dev/null
+++ b/tests/auto/blackbox/testdata/scan-result-in-other-product/app/main.cpp
@@ -0,0 +1,3 @@
+#include "app.h"
+
+int main() { }
diff --git a/tests/auto/blackbox/testdata/scan-result-in-other-product/lib/lib.h b/tests/auto/blackbox/testdata/scan-result-in-other-product/lib/lib.h
new file mode 100644
index 000000000..af6f627b7
--- /dev/null
+++ b/tests/auto/blackbox/testdata/scan-result-in-other-product/lib/lib.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void lib1_foo();
\ No newline at end of file
diff --git a/tests/auto/blackbox/testdata/scan-result-in-other-product/lib/lib.qbs b/tests/auto/blackbox/testdata/scan-result-in-other-product/lib/lib.qbs
new file mode 100644
index 000000000..fe2916714
--- /dev/null
+++ b/tests/auto/blackbox/testdata/scan-result-in-other-product/lib/lib.qbs
@@ -0,0 +1,7 @@
+Product {
+    files: "lib.h"
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: product.sourceDirectory
+    }
+}
diff --git a/tests/auto/blackbox/testdata/scan-result-in-other-product/other/other.qbs b/tests/auto/blackbox/testdata/scan-result-in-other-product/other/other.qbs
new file mode 100644
index 000000000..29682da1c
--- /dev/null
+++ b/tests/auto/blackbox/testdata/scan-result-in-other-product/other/other.qbs
@@ -0,0 +1,24 @@
+import qbs.TextFile
+
+Product {
+    type: "testproduct"
+    files: "../lib/lib.h"
+
+    Rule {
+        multiplex: true
+        Artifact {
+            fileTags: ["testproduct"]
+            filePath: "fubar"
+        }
+        prepare: {
+            var cmd = new JavaScriptCommand();
+            cmd.description = "generating text file";
+            cmd.sourceCode = function() {
+                var tf = new TextFile(output.filePath, TextFile.WriteOnly);
+                tf.writeLine("blubb");
+                tf.close();
+            }
+            return cmd;
+        }
+    }
+}
diff --git a/tests/auto/blackbox/testdata/scan-result-in-other-product/p.qbs b/tests/auto/blackbox/testdata/scan-result-in-other-product/p.qbs
new file mode 100644
index 000000000..fedf84989
--- /dev/null
+++ b/tests/auto/blackbox/testdata/scan-result-in-other-product/p.qbs
@@ -0,0 +1,7 @@
+Project {
+    references: [
+        "app/app.qbs",
+        "lib/lib.qbs",
+        "other/other.qbs",
+    ]
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index a1672f4c1..86108716e 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -2519,6 +2519,25 @@ void TestBlackbox::scannerItem()
     QVERIFY2(m_qbsStdout.contains("handling file2.in"), m_qbsStdout.constData());
 }
 
+void TestBlackbox::scanResultInOtherProduct()
+{
+    QDir::setCurrent(testDataDir + "/scan-result-in-other-product");
+    QCOMPARE(runQbs(), 0);
+    QVERIFY2(m_qbsStdout.contains("compiling main.cpp"), m_qbsStdout.constData());
+    QVERIFY2(m_qbsStdout.contains("generating text file"), m_qbsStdout.constData());
+    WAIT_FOR_NEW_TIMESTAMP();
+    REPLACE_IN_FILE("other/other.qbs", "blubb", "blubb2");
+    QCOMPARE(runQbs(), 0);
+    QVERIFY2(!m_qbsStdout.contains("compiling main.cpp"), m_qbsStdout.constData());
+    QVERIFY2(m_qbsStdout.contains("generating text file"), m_qbsStdout.constData());
+    WAIT_FOR_NEW_TIMESTAMP();
+    touch("lib/lib.h");
+    QCOMPARE(runQbs(), 0);
+    QEXPECT_FAIL("", "QBS-1532", Continue);
+    QVERIFY2(m_qbsStdout.contains("compiling main.cpp"), m_qbsStdout.constData());
+    QVERIFY2(!m_qbsStdout.contains("generating text file"), m_qbsStdout.constData());
+}
+
 void TestBlackbox::setupBuildEnvironment()
 {
     QDir::setCurrent(testDataDir + "/setup-build-environment");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index c1b20956d..d70c03c8f 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -271,6 +271,7 @@ private slots:
     void sanitizer_data();
     void sanitizer();
     void scannerItem();
+    void scanResultInOtherProduct();
     void setupBuildEnvironment();
     void setupRunEnvironment();
     void smartRelinking();