2 files changed, 45 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata/build-directories/project.qbs b/tests/auto/blackbox/testdata/build-directories/project.qbs
new file mode 100644
index 000000000..871c7a5c1
--- /dev/null
+++ b/tests/auto/blackbox/testdata/build-directories/project.qbs
@@ -0,0 +1,42 @@
+import qbs
+
+Project {
+    Product {
+        name: "p1"
+        type: "blubb1"
+        Transformer {
+            Artifact {
+                fileName: "dummy1.txt"
+                fileTags: product.type
+            }
+            prepare: {
+                var cmd = new JavaScriptCommand();
+                cmd.silent = true;
+                cmd.sourceCode = function() {
+                    print(product.buildDirectory);
+                }
+                return cmd;
+            }
+        }
+    }
+    Product {
+        name: "p2"
+        type: "blubb2"
+        Depends { name: "p1" }
+        Transformer {
+            Artifact {
+                fileName: "dummy2.txt"
+                fileTags: product.type
+            }
+            prepare: {
+                var cmd = new JavaScriptCommand();
+                cmd.silent = true;
+                cmd.sourceCode = function() {
+                    print(product.buildDirectory);
+                    print(project.buildDirectory);
+                }
+                return cmd;
+            }
+        }
+    }
+}
diff --git a/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs b/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs
index bb1bcb03f..e0884cfac 100644
--- a/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs
+++ b/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs
@@ -59,12 +59,12 @@ Project {
                 var sourceFileName = options["outfile"] || "lex.yy.c";
                 var headerFileName = options["header-file"];
                 var result = [{
-                    filePath: "GeneratedFiles/" + product.name + "/" + sourceFileName,
+                    filePath: "GeneratedFiles/" + sourceFileName,
                     fileTags: ["c"]
                 }];
                 if (headerFileName) {
                     result.push({
-                            filePath: "GeneratedFiles/" + product.name + "/" + headerFileName,
+                            filePath: "GeneratedFiles/" + headerFileName,
                             fileTags: ["hpp"]
                         });
                 }
@@ -75,7 +75,7 @@ Project {
                 if (product.isFlexAvailable) {
                     // flex is available. Let's call it.
                     cmd = new Command("flex", [input.filePath]);
-                    cmd.workingDirectory = product.buildDirectory + "/GeneratedFiles/" + product.name;
+                    cmd.workingDirectory = product.buildDirectory + "/GeneratedFiles";
                 } else {
                     // No flex available here, generate some C source and header.
                     cmd = new JavaScriptCommand();