Properly treat "usings" as inputs when applying rules.

This allows non-multiplex rules with only "usings" and no "inputs" to
work as expected, that is they create one transformer per "usings"
element.

Change-Id: Iba5144f81b082043878f3eefc111846b6d05646a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

7 files changed, 72 insertions, 10 deletions

diff --git a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
index e2094576e..855528615 100644
--- a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
+++ b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
@@ -12,12 +12,7 @@ Project {
         type: "mytype"
         name: "caller"
         Depends { name: "infinite-loop" }
-        Group {
-            files: "dummy-input.txt" // Needed because of QBS-277
-            fileTags: "schnurz"
-        }
         Rule {
-            inputs: "schnurz"
             usings: "application"
             Artifact {
                 fileName: "dummy"
diff --git a/tests/auto/blackbox/testdata/build-directories/project.qbs b/tests/auto/blackbox/testdata/build-directories/project.qbs
index 025340a0a..cb83999e2 100644
--- a/tests/auto/blackbox/testdata/build-directories/project.qbs
+++ b/tests/auto/blackbox/testdata/build-directories/project.qbs
@@ -23,12 +23,7 @@ Project {
         name: "p2"
         type: "blubb2"
         Depends { name: "p1" }
-        Group {
-            files: "input.txt"
-            fileTags: "input"
-        }
         Rule {
-            inputs: "input"
             usings: "blubb1"
             Artifact {
                 fileName: "dummy2.txt"
diff --git a/tests/auto/api/testdata/infinite-loop-process/dummy-input.txt b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/custom1.in
index e69de29bb..e69de29bb 100644
--- a/tests/auto/api/testdata/infinite-loop-process/dummy-input.txt
+++ b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/custom1.in
diff --git a/tests/auto/blackbox/testdata/build-directories/input.txt b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/custom2.in
index e69de29bb..e69de29bb 100644
--- a/tests/auto/blackbox/testdata/build-directories/input.txt
+++ b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/custom2.in
diff --git a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs
new file mode 100644
index 000000000..bf34cc8e6
--- /dev/null
+++ b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs
@@ -0,0 +1,62 @@
+import qbs
+import qbs.FileInfo
+import qbs.TextFile
+
+Project {
+    Product {
+        name: "p1"
+        type: "custom"
+        Group {
+            files: "custom1.in"
+            fileTags: "custom.in"
+        }
+    }
+    Product {
+        name: "p2"
+        type: "custom"
+        Group {
+            files: "custom2.in"
+            fileTags: "custom.in"
+        }
+    }
+
+    Rule {
+        inputs: "custom.in"
+        Artifact {
+            fileName: FileInfo.baseName(input.filePath) + ".out"
+            fileTags: "custom"
+        }
+        prepare: {
+            var cmd = new JavaScriptCommand();
+            cmd.description = "generating " + output.fileName;
+            cmd.sourceCode = function() {
+                var f = new TextFile(output.filePath, TextFile.WriteOnly);
+                f.close();
+            }
+            return cmd;
+        }
+    }
+
+    Product {
+        name: "p3"
+        type: "custom-plus"
+        Depends { name: "p1" }
+        Depends { name: "p2" }
+        Rule {
+            usings: "custom"
+            Artifact {
+                fileName: FileInfo.baseName(input.filePath) + ".plus"
+                fileTags: "custom-plus"
+            }
+            prepare: {
+                var cmd = new JavaScriptCommand();
+                cmd.description = "generating " + output.fileName;
+                cmd.sourceCode = function() {
+                    var f = new TextFile(output.filePath, TextFile.WriteOnly);
+                    f.close();
+                }
+            return cmd;
+            }
+        }
+    }
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 150baaefd..fcf3cf14a 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -493,6 +493,15 @@ void TestBlackbox::resolve_project_dry_run()
     QVERIFY2(!QFile::exists(buildGraphPath), qPrintable(buildGraphPath));
 }
 
+void TestBlackbox::usingsAsSoleInputsNonMultiplexed()
+{
+    QDir::setCurrent(testDataDir + QLatin1String("/usings-as-sole-inputs-non-multiplexed"));
+    QCOMPARE(runQbs(), 0);
+    const QString p3BuildDir = productBuildDir("p3");
+    QVERIFY(regularFileExists(p3BuildDir) + "/custom1.out.plus");
+    QVERIFY(regularFileExists(p3BuildDir) + "/custom2.out.plus");
+}
+
 static bool symlinkExists(const QString &linkFilePath)
 {
     return QFileInfo(linkFilePath).isSymLink();
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 6d4e4981b..844d01ff8 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -132,6 +132,7 @@ private slots:
     void resolve_project();
     void resolve_project_dry_run_data();
     void resolve_project_dry_run();
+    void usingsAsSoleInputsNonMultiplexed();
     void clean();
     void exportSimple();
     void exportWithRecursiveDepends();