Fix potential false caching of module prototypes

Our code assumed that products with the same profile and the same
multiplex configuration would also evaluate a module's condition to the
same value, which is not true: Properties such as qbs.architecture,
which are commonly checked in module conditions, can be set in a product
item independently of multiplexing.
We now evaluate the module condition for every product. According to our
benchmarker, the slowdown is a very modest 2% and does not appear to
increase for larger projects.
This patch amends 08ce978733, which tried to address the same problem,
but succeeded only for a subset of the possible cases.

Change-Id: I992e0f0d5cf207949cf5d863f242b9476ecdfc05
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

7 files changed, 56 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs b/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs
new file mode 100644
index 000000000..dc3768203
--- /dev/null
+++ b/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs
@@ -0,0 +1,21 @@
+import qbs
+
+Project {
+    Product {
+        name: "p1"
+        qbs.architecture: "a"
+        Depends { name: "m" }
+    }
+    Product {
+        name: "p2"
+        qbs.architecture: "b"
+        Depends { name: "m" }
+    }
+    Product {
+        name: "p3"
+        multiplexByQbsProperties: "architectures"
+        aggregate: false
+        qbs.architectures: ["b", "c", "d"]
+        Depends { name: "m" }
+    }
+}
diff --git a/tests/auto/blackbox/testdata/module-conditions/modules/m/m1.qbs b/tests/auto/blackbox/testdata/module-conditions/modules/m/m1.qbs
new file mode 100644
index 000000000..884350c3f
--- /dev/null
+++ b/tests/auto/blackbox/testdata/module-conditions/modules/m/m1.qbs
@@ -0,0 +1,6 @@
+Module {
+    condition: qbs.architecture === "a"
+    validate: {
+        console.info("loaded m1");
+    }
+}
diff --git a/tests/auto/blackbox/testdata/module-conditions/modules/m/m2.qbs b/tests/auto/blackbox/testdata/module-conditions/modules/m/m2.qbs
new file mode 100644
index 000000000..bcec6f424
--- /dev/null
+++ b/tests/auto/blackbox/testdata/module-conditions/modules/m/m2.qbs
@@ -0,0 +1,6 @@
+Module {
+    condition: qbs.architecture === "b"
+    validate: {
+        console.info("loaded m2");
+    }
+}
diff --git a/tests/auto/blackbox/testdata/module-conditions/modules/m/m3.qbs b/tests/auto/blackbox/testdata/module-conditions/modules/m/m3.qbs
new file mode 100644
index 000000000..5453c617f
--- /dev/null
+++ b/tests/auto/blackbox/testdata/module-conditions/modules/m/m3.qbs
@@ -0,0 +1,6 @@
+Module {
+    condition: qbs.architecture === "c"
+    validate: {
+        console.info("loaded m3");
+    }
+}
diff --git a/tests/auto/blackbox/testdata/module-conditions/modules/m/m4.qbs b/tests/auto/blackbox/testdata/module-conditions/modules/m/m4.qbs
new file mode 100644
index 000000000..a4cb0350d
--- /dev/null
+++ b/tests/auto/blackbox/testdata/module-conditions/modules/m/m4.qbs
@@ -0,0 +1,6 @@
+Module {
+    condition: qbs.architecture === "d"
+    validate: {
+        console.info("loaded m4");
+    }
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 06e135549..8068aee48 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -6004,6 +6004,16 @@ void TestBlackbox::missingOverridePrefix()
              m_qbsStderr.constData());
 }
 
+void TestBlackbox::moduleConditions()
+{
+    QDir::setCurrent(testDataDir + "/module-conditions");
+    QCOMPARE(runQbs(), 0);
+    QCOMPARE(m_qbsStdout.count("loaded m1"), 1);
+    QCOMPARE(m_qbsStdout.count("loaded m2"), 2);
+    QCOMPARE(m_qbsStdout.count("loaded m3"), 1);
+    QCOMPARE(m_qbsStdout.count("loaded m4"), 1);
+}
+
 void TestBlackbox::movedFileDependency()
 {
     QDir::setCurrent(testDataDir + "/moved-file-dependency");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 87a6b1006..0dcfc5b31 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -170,6 +170,7 @@ private slots:
     void missingDependency();
     void missingProjectFile();
     void missingOverridePrefix();
+    void moduleConditions();
     void movedFileDependency();
     void multipleChanges();
     void multipleConfigurations();