Take into account qbs module props used by providers when caching

Otherwise, we end up with wrong modules used by products that override
qbs module props such as sysroot.

Change-Id: Id5a74e8198217e737fb02a506ac7a9bb216b4d60
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 65 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/module-providers/provider_a.qbs b/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/module-providers/provider_a.qbs
new file mode 100644
index 000000000..95c89cd1c
--- /dev/null
+++ b/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/module-providers/provider_a.qbs
@@ -0,0 +1,9 @@
+import "../../qbs-module-providers-helpers.js" as Helpers
+
+ModuleProvider {
+    property string sysroot: qbs.sysroot
+    relativeSearchPaths: {
+        Helpers.writeModule(outputBaseDir, "qbsmetatestmodule", sysroot);
+        return "";
+    }
+}
diff --git a/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/qbs-module-properties-in-providers.qbs b/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/qbs-module-properties-in-providers.qbs
new file mode 100644
index 000000000..a338a220d
--- /dev/null
+++ b/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/qbs-module-properties-in-providers.qbs
@@ -0,0 +1,34 @@
+Project {
+    qbsModuleProviders: "provider_a"
+    name: "project"
+
+    Profile {
+        name: "profile1"
+        qbs.sysroot: "sysroot1"
+    }
+
+    Profile {
+        name: "profile2"
+        qbs.sysroot: "sysroot2"
+    }
+
+    Product {
+        name: "product1"
+        Depends { name: "qbsmetatestmodule" }
+        property bool dummy: {
+            console.info("product1.qbsmetatestmodule.prop: " + qbsmetatestmodule.prop);
+        }
+        // multiplex over profiles, sysroot should not be cached
+        qbs.profiles: ["profile1", "profile2"]
+    }
+
+    Product {
+        name: "product2"
+        Depends { name: "qbsmetatestmodule" }
+        property bool dummy: {
+            console.info("product2.qbsmetatestmodule.prop: " + qbsmetatestmodule.prop);
+        }
+        // multiplex over profiles, sysroot should not be cached
+        qbs.profiles: ["profile1", "profile2"]
+    }
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index fde8c61f4..679972d37 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -6111,6 +6111,27 @@ void TestBlackbox::qbsConfigAddProfile_data()
                                     << QString("Profile properties must be key/value pairs");
 }
 
+// checks that we can set qbs module properties in providers and provider cache works corectly
+void TestBlackbox::qbsModulePropertiesInProviders()
+{
+    QDir::setCurrent(testDataDir + "/qbs-module-properties-in-providers");
+
+    QbsRunParameters params("resolve");
+
+    QCOMPARE(runQbs(params), 0);
+
+    // We have 2 products in 2 configurations, but second product should use the cached value
+    // so we should have only 2 copies of the module, not 4.
+    QCOMPARE(m_qbsStdout.count("Running setup script for qbsmetatestmodule"), 2);
+
+    // Check that products get correct values from modules
+    QVERIFY2(m_qbsStdout.contains(("product1.qbsmetatestmodule.prop: sysroot1")), m_qbsStdout);
+    QVERIFY2(m_qbsStdout.contains(("product1.qbsmetatestmodule.prop: sysroot2")), m_qbsStdout);
+
+    QVERIFY2(m_qbsStdout.contains(("product2.qbsmetatestmodule.prop: sysroot1")), m_qbsStdout);
+    QVERIFY2(m_qbsStdout.contains(("product2.qbsmetatestmodule.prop: sysroot2")), m_qbsStdout);
+}
+
 // Tests whether it is possible to set qbsModuleProviders in Product and Project items
 // and that the order of providers results in correct priority
 void TestBlackbox::qbsModuleProviders()
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index ea3a8597d..dc184989c 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -262,6 +262,7 @@ private slots:
     void qbsConfig();
     void qbsConfigAddProfile();
     void qbsConfigAddProfile_data();
+    void qbsModulePropertiesInProviders();
     void qbsModuleProviders();
     void qbsModuleProviders_data();
     void qbsModuleProvidersCliOverride();