Update "importingProduct" autotest to reflect newly found bug.

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

2 files changed, 32 insertions, 26 deletions

diff --git a/tests/auto/blackbox/testdata/importing-product/importing-product.qbs b/tests/auto/blackbox/testdata/importing-product/importing-product.qbs
index e54e8cdbd..e81f76077 100644
--- a/tests/auto/blackbox/testdata/importing-product/importing-product.qbs
+++ b/tests/auto/blackbox/testdata/importing-product/importing-product.qbs
@@ -2,38 +2,43 @@ import qbs
 import qbs.File
 
 Project {
-Product {
-    name: "dep"
+    Product {
+        name: "dep"
 
-    Export {
-        Depends { name: "cpp" }
-        cpp.includePaths: [importingProduct.buildDirectory + "/random_dir"]
+        Export {
+            Depends { name: "cpp" }
+            cpp.includePaths: [importingProduct.buildDirectory + "/random_dir"]
 
-        Rule {
-            inputs: ["hpp_in"]
-            Artifact {
-                filePath: product.buildDirectory + "/random_dir/" + input.completeBaseName
-                fileTags: ["hpp"]
-            }
-            prepare: {
-                var cmd = new JavaScriptCommand();
-                cmd.description = "Copying file";
-                cmd.sourceCode = function() {
-                    File.copy(input.filePath, output.filePath);
+            Rule {
+                inputs: ["hpp_in"]
+                Artifact {
+                    filePath: product.buildDirectory + "/random_dir/" + input.completeBaseName
+                    fileTags: ["hpp"]
+                }
+                prepare: {
+                    var cmd = new JavaScriptCommand();
+                    cmd.description = "Copying file";
+                    cmd.sourceCode = function() {
+                        File.copy(input.filePath, output.filePath);
+                    }
+                    return [cmd];
                 }
-                return [cmd];
             }
         }
     }
-}
 
-CppApplication {
-    name: "theProduct"
-    Depends { name: "dep" }
-    Group {
-        files: ["header.h.in"]
-        fileTags: ["hpp_in"]
+    CppApplication {
+        name: "theProduct"
+        Depends { name: "dep" }
+        Group {
+            files: ["header.h.in"]
+            fileTags: ["hpp_in"]
+        }
+        files: ["main.cpp"]
+    }
+
+    CppApplication {
+        name: "theProduct2"
+        Depends { name: "dep" }
     }
-    files: ["main.cpp"]
-}
 }
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 1c8daf33c..8a3ac73de 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -3589,6 +3589,7 @@ void TestBlackbox::iconsetApp()
 void TestBlackbox::importingProduct()
 {
     QDir::setCurrent(testDataDir + "/importing-product");
+    QEXPECT_FAIL(0, "QBS-977", Abort);
     QCOMPARE(runQbs(), 0);
 }