40 files changed, 564 insertions, 322 deletions

diff --git a/tests/auto/blackbox/CMakeLists.txt b/tests/auto/blackbox/CMakeLists.txt
index 5b5376064..1d90ec95b 100644
--- a/tests/auto/blackbox/CMakeLists.txt
+++ b/tests/auto/blackbox/CMakeLists.txt
@@ -63,6 +63,14 @@ add_qbs_test(blackbox-joblimits
         tst_blackboxjoblimits.cpp
     )
 
+add_qbs_test(blackbox-providers
+    SOURCES
+        ../shared.h
+        tst_blackboxbase.cpp
+        tst_blackboxbase.h
+        tst_blackboxproviders.cpp
+    )
+
 add_qbs_test(blackbox-qt
     SOURCES
         ../shared.h
diff --git a/tests/auto/blackbox/blackbox-providers.qbs b/tests/auto/blackbox/blackbox-providers.qbs
new file mode 100644
index 000000000..95ebaa423
--- /dev/null
+++ b/tests/auto/blackbox/blackbox-providers.qbs
@@ -0,0 +1,21 @@
+import qbs.Utilities
+
+QbsAutotest {
+    testName: "blackbox-providers"
+    Depends { name: "qbs_app" }
+    Depends { name: "qbs-setup-toolchains" }
+    Group {
+        name: "testdata"
+        prefix: "testdata-providers/"
+        files: ["**/*"]
+        fileTags: []
+    }
+    files: [
+        "../shared.h",
+        "tst_blackboxbase.cpp",
+        "tst_blackboxbase.h",
+        "tst_blackboxproviders.cpp",
+        "tst_blackboxproviders.h",
+    ]
+    cpp.defines: base.concat(["SRCDIR=" + Utilities.cStringQuote(path)])
+}
diff --git a/tests/auto/blackbox/testdata/fallback-module-provider/fallback-module-provider.qbs b/tests/auto/blackbox/testdata-providers/fallback-module-provider/fallback-module-provider.qbs
index a798e15b3..a798e15b3 100644
--- a/tests/auto/blackbox/testdata/fallback-module-provider/fallback-module-provider.qbs
+++ b/tests/auto/blackbox/testdata-providers/fallback-module-provider/fallback-module-provider.qbs
diff --git a/tests/auto/blackbox/testdata/fallback-module-provider/libdir/qbsmetatestmodule.pc b/tests/auto/blackbox/testdata-providers/fallback-module-provider/libdir/qbsmetatestmodule.pc
index ae4daba89..ae4daba89 100644
--- a/tests/auto/blackbox/testdata/fallback-module-provider/libdir/qbsmetatestmodule.pc
+++ b/tests/auto/blackbox/testdata-providers/fallback-module-provider/libdir/qbsmetatestmodule.pc
diff --git a/tests/auto/blackbox/testdata/fallback-module-provider/main.cpp b/tests/auto/blackbox/testdata-providers/fallback-module-provider/main.cpp
index 442b755bf..442b755bf 100644
--- a/tests/auto/blackbox/testdata/fallback-module-provider/main.cpp
+++ b/tests/auto/blackbox/testdata-providers/fallback-module-provider/main.cpp
diff --git a/tests/auto/blackbox/testdata-providers/module-providers-cache/module-providers-cache.qbs b/tests/auto/blackbox/testdata-providers/module-providers-cache/module-providers-cache.qbs
new file mode 100644
index 000000000..508ed84d2
--- /dev/null
+++ b/tests/auto/blackbox/testdata-providers/module-providers-cache/module-providers-cache.qbs
@@ -0,0 +1,11 @@
+Project {
+    qbsModuleProviders: ["provider_a"]
+    name: "project"
+    property string dummyProp
+
+    Product {
+        name: "p1"
+        Depends { name: "qbsothermodule" }
+        Depends { name: "qbsmetatestmodule" }
+    }
+}
diff --git a/tests/auto/blackbox/testdata-providers/module-providers-cache/module-providers/provider_a.qbs b/tests/auto/blackbox/testdata-providers/module-providers-cache/module-providers/provider_a.qbs
new file mode 100644
index 000000000..782cf7d25
--- /dev/null
+++ b/tests/auto/blackbox/testdata-providers/module-providers-cache/module-providers/provider_a.qbs
@@ -0,0 +1,9 @@
+import "../../qbs-module-providers-helpers.js" as Helpers
+
+ModuleProvider {
+    relativeSearchPaths: {
+        Helpers.writeModule(outputBaseDir, "qbsmetatestmodule", "from_provider_a");
+        Helpers.writeModule(outputBaseDir, "qbsothermodule", "from_provider_a");
+        return "";
+    }
+}
diff --git a/tests/auto/blackbox/testdata/module-providers/main.cpp b/tests/auto/blackbox/testdata-providers/module-providers/main.cpp
index 85a4f551c..85a4f551c 100644
--- a/tests/auto/blackbox/testdata/module-providers/main.cpp
+++ b/tests/auto/blackbox/testdata-providers/module-providers/main.cpp
diff --git a/tests/auto/blackbox/testdata/module-providers/module-providers.qbs b/tests/auto/blackbox/testdata-providers/module-providers/module-providers.qbs
index e83c80bb1..e83c80bb1 100644
--- a/tests/auto/blackbox/testdata/module-providers/module-providers.qbs
+++ b/tests/auto/blackbox/testdata-providers/module-providers/module-providers.qbs
diff --git a/tests/auto/blackbox/testdata/module-providers/module-providers/mygenerator/provider.qbs b/tests/auto/blackbox/testdata-providers/module-providers/module-providers/mygenerator/provider.qbs
index dae02c03a..dae02c03a 100644
--- a/tests/auto/blackbox/testdata/module-providers/module-providers/mygenerator/provider.qbs
+++ b/tests/auto/blackbox/testdata-providers/module-providers/module-providers/mygenerator/provider.qbs
diff --git a/tests/auto/blackbox/testdata/module-providers/module-providers/othergenerator/provider.qbs b/tests/auto/blackbox/testdata-providers/module-providers/module-providers/othergenerator/provider.qbs
index 66557037c..66557037c 100644
--- a/tests/auto/blackbox/testdata/module-providers/module-providers/othergenerator/provider.qbs
+++ b/tests/auto/blackbox/testdata-providers/module-providers/module-providers/othergenerator/provider.qbs
diff --git a/tests/auto/blackbox/testdata/probe-in-module-provider/module-providers/provider_a.qbs b/tests/auto/blackbox/testdata-providers/probe-in-module-provider/module-providers/provider_a.qbs
index 8a7c7d6ed..8a7c7d6ed 100644
--- a/tests/auto/blackbox/testdata/probe-in-module-provider/module-providers/provider_a.qbs
+++ b/tests/auto/blackbox/testdata-providers/probe-in-module-provider/module-providers/provider_a.qbs
diff --git a/tests/auto/blackbox/testdata/probe-in-module-provider/probe-in-module-provider.qbs b/tests/auto/blackbox/testdata-providers/probe-in-module-provider/probe-in-module-provider.qbs
index cb346beeb..cb346beeb 100644
--- a/tests/auto/blackbox/testdata/probe-in-module-provider/probe-in-module-provider.qbs
+++ b/tests/auto/blackbox/testdata-providers/probe-in-module-provider/probe-in-module-provider.qbs
diff --git a/tests/auto/blackbox/testdata/providers-properties/module-providers/provider_a.qbs b/tests/auto/blackbox/testdata-providers/providers-properties/module-providers/provider_a.qbs
index ab9d475d8..ab9d475d8 100644
--- a/tests/auto/blackbox/testdata/providers-properties/module-providers/provider_a.qbs
+++ b/tests/auto/blackbox/testdata-providers/providers-properties/module-providers/provider_a.qbs
diff --git a/tests/auto/blackbox/testdata/providers-properties/module-providers/provider_b.qbs b/tests/auto/blackbox/testdata-providers/providers-properties/module-providers/provider_b.qbs
index 1b2a79979..1b2a79979 100644
--- a/tests/auto/blackbox/testdata/providers-properties/module-providers/provider_b.qbs
+++ b/tests/auto/blackbox/testdata-providers/providers-properties/module-providers/provider_b.qbs
diff --git a/tests/auto/blackbox/testdata/providers-properties/providers-properties.qbs b/tests/auto/blackbox/testdata-providers/providers-properties/providers-properties.qbs
index 258a973fa..258a973fa 100644
--- a/tests/auto/blackbox/testdata/providers-properties/providers-properties.qbs
+++ b/tests/auto/blackbox/testdata-providers/providers-properties/providers-properties.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/module-providers/provider_a.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-properties-in-providers/module-providers/provider_a.qbs
index 95c89cd1c..95c89cd1c 100644
--- a/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/module-providers/provider_a.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-properties-in-providers/module-providers/provider_a.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/qbs-module-properties-in-providers.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-properties-in-providers/qbs-module-properties-in-providers.qbs
index a338a220d..c2fc58299 100644
--- a/tests/auto/blackbox/testdata/qbs-module-properties-in-providers/qbs-module-properties-in-providers.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-properties-in-providers/qbs-module-properties-in-providers.qbs
@@ -4,12 +4,12 @@ Project {
 
     Profile {
         name: "profile1"
-        qbs.sysroot: "sysroot1"
+        qbs.sysroot: "/sysroot1"
     }
 
     Profile {
         name: "profile2"
-        qbs.sysroot: "sysroot2"
+        qbs.sysroot: "/sysroot2"
     }
 
     Product {
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers-cli-override/module-providers/provider_a.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-providers-cli-override/module-providers/provider_a.qbs
index d34d1cac5..d34d1cac5 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers-cli-override/module-providers/provider_a.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers-cli-override/module-providers/provider_a.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers-cli-override/module-providers/provider_b.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-providers-cli-override/module-providers/provider_b.qbs
index 767e30923..767e30923 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers-cli-override/module-providers/provider_b.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers-cli-override/module-providers/provider_b.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers-cli-override/qbs-module-providers-cli-override.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-providers-cli-override/qbs-module-providers-cli-override.qbs
index 6f94ab207..6f94ab207 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers-cli-override/qbs-module-providers-cli-override.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers-cli-override/qbs-module-providers-cli-override.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers-compatibility/module-providers/named_provider.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-providers-compatibility/module-providers/named_provider.qbs
index 07114b5ef..07114b5ef 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers-compatibility/module-providers/named_provider.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers-compatibility/module-providers/named_provider.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers-compatibility/module-providers/qbsmetatestmodule/provider.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-providers-compatibility/module-providers/qbsmetatestmodule/provider.qbs
index b04a52261..b04a52261 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers-compatibility/module-providers/qbsmetatestmodule/provider.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers-compatibility/module-providers/qbsmetatestmodule/provider.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers-compatibility/qbs-module-providers-compatibility.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-providers-compatibility/qbs-module-providers-compatibility.qbs
index 7885b540a..7885b540a 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers-compatibility/qbs-module-providers-compatibility.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers-compatibility/qbs-module-providers-compatibility.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers-helpers.js b/tests/auto/blackbox/testdata-providers/qbs-module-providers-helpers.js
index 8b6d9e275..8b6d9e275 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers-helpers.js
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers-helpers.js
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers/module-providers/provider_a.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-providers/module-providers/provider_a.qbs
index d34d1cac5..d34d1cac5 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers/module-providers/provider_a.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers/module-providers/provider_a.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers/module-providers/provider_b.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-providers/module-providers/provider_b.qbs
index 767e30923..767e30923 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers/module-providers/provider_b.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers/module-providers/provider_b.qbs
diff --git a/tests/auto/blackbox/testdata/qbs-module-providers/qbs-module-providers.qbs b/tests/auto/blackbox/testdata-providers/qbs-module-providers/qbs-module-providers.qbs
index 00776a62e..00776a62e 100644
--- a/tests/auto/blackbox/testdata/qbs-module-providers/qbs-module-providers.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbs-module-providers/qbs-module-providers.qbs
diff --git a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/libs/libA.cpp b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/libs/libA.cpp
index 0c5274415..0c5274415 100644
--- a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/libs/libA.cpp
+++ b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/libs/libA.cpp
diff --git a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/libs/libA.h b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/libs/libA.h
index ddaaf1609..ddaaf1609 100644
--- a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/libs/libA.h
+++ b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/libs/libA.h
diff --git a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/libs/libs.qbs b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/libs/libs.qbs
index b473083c6..b473083c6 100644
--- a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/libs/libs.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/libs/libs.qbs
diff --git a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/main.cpp b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/main.cpp
index 5fa0f7eed..5fa0f7eed 100644
--- a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/main.cpp
+++ b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/main.cpp
diff --git a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/qbspkgconfig-module-provider.qbs b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/qbspkgconfig-module-provider.qbs
index d2b3654ae..d2b3654ae 100644
--- a/tests/auto/blackbox/testdata/qbspkgconfig-module-provider/qbspkgconfig-module-provider.qbs
+++ b/tests/auto/blackbox/testdata-providers/qbspkgconfig-module-provider/qbspkgconfig-module-provider.qbs
diff --git a/tests/auto/blackbox/testdata/conflicting-property-values/conflicting-property-values.qbs b/tests/auto/blackbox/testdata/conflicting-property-values/conflicting-property-values.qbs
new file mode 100644
index 000000000..23b6ee5a3
--- /dev/null
+++ b/tests/auto/blackbox/testdata/conflicting-property-values/conflicting-property-values.qbs
@@ -0,0 +1,41 @@
+Project {
+    Product {
+        name: "low"
+        Export { property string prop: "low"; property string prop2: "low" }
+    }
+    Product {
+        name: "higher1"
+        Export { Depends { name: "low" } low.prop: "higher1" }
+    }
+    Product {
+        name: "higher2"
+        Export { Depends { name: "low" } low.prop: "higher2" }
+    }
+    Product {
+        name: "highest1"
+        Export {
+            Depends { name: "low" }
+            Depends { name: "higher1" }
+            Depends { name: "higher2" }
+            low.prop: "highest1"
+            low.prop2: "highest"
+        }
+    }
+    Product {
+        name: "highest2"
+        Export {
+            Depends { name: "low" }
+            Depends { name: "higher1" }
+            Depends { name: "higher2" }
+            low.prop: "highest2"
+            low.prop2: "highest"
+        }
+    }
+    Product {
+        name: "toplevel"
+        Depends { name: "highest1" }
+        Depends { name: "highest2" }
+        low.prop: name
+        property bool dummy: { console.info("final prop value: " + low.prop); }
+    }
+}
diff --git a/tests/auto/blackbox/testdata/deprecated-property/deprecated-property.qbs b/tests/auto/blackbox/testdata/deprecated-property/deprecated-property.qbs
index e699672a8..7d1550312 100644
--- a/tests/auto/blackbox/testdata/deprecated-property/deprecated-property.qbs
+++ b/tests/auto/blackbox/testdata/deprecated-property/deprecated-property.qbs
@@ -1,5 +1,3 @@
-import qbs // FIXME: Don't remove this import because then the test fails!
-
 Product {
     Depends { name: "themodule" }
     themodule.newProp: true
diff --git a/tests/auto/blackbox/testdata/exports-qbs/lib.qbs b/tests/auto/blackbox/testdata/exports-qbs/lib.qbs
index 951b0fa74..01f89a221 100644
--- a/tests/auto/blackbox/testdata/exports-qbs/lib.qbs
+++ b/tests/auto/blackbox/testdata/exports-qbs/lib.qbs
@@ -52,7 +52,7 @@ DynamicLibrary {
             condition: true
             prefixMapping: [{
                 prefix: includeDir,
-                replacement: FileInfo.joinPaths(qbs.installPrefix, exportingProduct.headersInstallDir)
+                replacement: FileInfo.joinPaths(exportingProduct.qbs.installPrefix, exportingProduct.headersInstallDir)
             }]
         }
     }
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index fd81dd494..e8934c403 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1070,11 +1070,11 @@ void TestBlackbox::deprecatedProperty()
     QVERIFY(runQbs(params) != 0);
     m_qbsStderr = QDir::fromNativeSeparators(QString::fromLocal8Bit(m_qbsStderr)).toLocal8Bit();
     const bool hasExpiringWarning = m_qbsStderr.contains(QByteArray(
-            "deprecated-property.qbs:6:29 The property 'expiringProp' is "
+            "deprecated-property.qbs:4:29 The property 'expiringProp' is "
             "deprecated and will be removed in Qbs ") + version.toLocal8Bit());
     QVERIFY2(expiringWarning == hasExpiringWarning, m_qbsStderr.constData());
     const bool hasRemovedOutput = m_qbsStderr.contains(
-                "deprecated-property.qbs:7:28 The property 'veryOldProp' can no "
+                "deprecated-property.qbs:5:28 The property 'veryOldProp' can no "
                 "longer be used. It was removed in Qbs 1.3.0.");
     QVERIFY2(hasRemovedOutput == !expiringError, m_qbsStderr.constData());
     QVERIFY2(m_qbsStderr.contains("Property 'forgottenProp' was scheduled for removal in version "
@@ -1961,6 +1961,42 @@ void TestBlackbox::conanfileProbe()
     QCOMPARE(actualResults, expectedResults);
 }
 
+void TestBlackbox::conflictingPropertyValues_data()
+{
+    QTest::addColumn<bool>("overrideInProduct");
+    QTest::newRow("don't override in product") << false;
+    QTest::newRow("override in product") << true;
+}
+
+void TestBlackbox::conflictingPropertyValues()
+{
+    QFETCH(bool, overrideInProduct);
+
+    QDir::setCurrent(testDataDir + "/conflicting-property-values");
+    if (overrideInProduct)
+        REPLACE_IN_FILE("conflicting-property-values.qbs", "// low.prop: name", "low.prop: name");
+    else
+        REPLACE_IN_FILE("conflicting-property-values.qbs", "low.prop: name", "// low.prop: name");
+    WAIT_FOR_NEW_TIMESTAMP();
+    QCOMPARE(runQbs(QString("resolve")), 0);
+    if (overrideInProduct) {
+        // Binding in product itself overrides everything else, module-level conflicts
+        // are irrelevant.
+        QVERIFY2(m_qbsStdout.contains("final prop value: toplevel"), m_qbsStdout.constData());
+        QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+    } else {
+        // Only the conflicts in the highest-level modules are reported, lower-level conflicts
+        // are irrelevant.
+        // prop2 does not cause a conflict, because the values are the same.
+        QVERIFY2(m_qbsStdout.contains("final prop value: highest"), m_qbsStdout.constData());
+        QVERIFY2(m_qbsStderr.contains("Conflicting scalar values for property 'prop'"),
+                 m_qbsStderr.constData());
+        QVERIFY2(m_qbsStderr.count("values.qbs") == 2, m_qbsStderr.constData());
+        QVERIFY2(m_qbsStderr.contains("values.qbs:20:23"), m_qbsStderr.constData());
+        QVERIFY2(m_qbsStderr.contains("values.qbs:30:23"), m_qbsStderr.constData());
+    }
+}
+
 void TestBlackbox::cpuFeatures()
 {
     QDir::setCurrent(testDataDir + "/cpu-features");
@@ -3395,23 +3431,6 @@ void TestBlackbox::probeInExportedModule()
     QVERIFY2(m_qbsStdout.contains("listProp: myother,my"), m_qbsStdout.constData());
 }
 
-void TestBlackbox::probeInModuleProvider()
-{
-    QDir::setCurrent(testDataDir + "/probe-in-module-provider");
-
-    QbsRunParameters params;
-    params.command = "build";
-    params.arguments << "--force-probe-execution";
-    QCOMPARE(runQbs(params), 0);
-    QVERIFY2(m_qbsStdout.contains("Running probe"), m_qbsStdout);
-    QVERIFY2(m_qbsStdout.contains("p.qbsmetatestmodule.boolProp: true"), m_qbsStdout);
-    WAIT_FOR_NEW_TIMESTAMP();
-    touch("probe-in-module-provider.qbs");
-    QCOMPARE(runQbs(), 0);
-    QVERIFY2(m_qbsStdout.contains("p.qbsmetatestmodule.boolProp: true"), m_qbsStdout);
-    QVERIFY2(!m_qbsStdout.contains("Running probe"), m_qbsStdout);
-}
-
 void TestBlackbox::probesAndArrayProperties()
 {
     QDir::setCurrent(testDataDir + "/probes-and-array-properties");
@@ -3447,7 +3466,7 @@ void TestBlackbox::propertyAssignmentInFailedModule()
     QVERIFY(runQbs(failParams) != 0);
     QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList("modules.m.doFail:true"))), 0);
     QVERIFY2(m_qbsStdout.contains("Resolving"), m_qbsStdout.constData());
-    QEXPECT_FAIL(nullptr, "circular dependency between module merging and validation", Continue);
+    failParams.expectFailure = false;
     QCOMPARE(runQbs(failParams), 0);
 }
 
@@ -5574,11 +5593,7 @@ void TestBlackbox::propertyPrecedence()
     switchProfileContents(profile.p, s.get(), false);
     switchFileContents(nonleafFile, true);
     QCOMPARE(runQbs(resolveParams), 0);
-    QVERIFY2(m_qbsStderr.contains("WARNING: Conflicting scalar values at")
-             && m_qbsStderr.contains("nonleaf.qbs:4:22")
-             && m_qbsStderr.contains("dep.qbs:6:26"),
-             m_qbsStderr.constData());
-    QCOMPARE(runQbs(params), 0);
+    QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData()); QCOMPARE(runQbs(params), 0);
     QVERIFY2(m_qbsStdout.contains("scalar prop: export\n")
              && m_qbsStdout.contains("list prop: [\"export\",\"nonleaf\",\"leaf\"]\n"),
              m_qbsStdout.constData());
@@ -5586,10 +5601,7 @@ void TestBlackbox::propertyPrecedence()
     // Case 8: [cmdline=0,prod=0,export=1,nonleaf=1,profile=1]
     switchProfileContents(profile.p, s.get(), true);
     QCOMPARE(runQbs(resolveParams), 0);
-    QVERIFY2(m_qbsStderr.contains("WARNING: Conflicting scalar values at")
-             && m_qbsStderr.contains("nonleaf.qbs:4:22")
-             && m_qbsStderr.contains("dep.qbs:6:26"),
-             m_qbsStderr.constData());
+    QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
     QCOMPARE(runQbs(params), 0);
     QVERIFY2(m_qbsStdout.contains("scalar prop: export\n")
              && m_qbsStdout.contains("list prop: [\"export\",\"nonleaf\",\"profile\"]\n"),
@@ -5977,19 +5989,6 @@ void TestBlackbox::protobufLibraryInstall()
             QFileInfo::exists(installRootInclude + "/hello/world.pb.h"));
 }
 
-// Tests whether it is possible to set providers properties in a Product or from command-line
-void TestBlackbox::providersProperties()
-{
-    QDir::setCurrent(testDataDir + "/providers-properties");
-
-    QbsRunParameters params("build");
-    params.arguments = QStringList("moduleProviders.provider_b.someProp: \"first,second\"");
-    QCOMPARE(runQbs(params), 0);
-    QVERIFY2(m_qbsStdout.contains("p.qbsmetatestmodule.listProp: [\"someValue\"]"), m_qbsStdout);
-    QVERIFY2(m_qbsStdout.contains(
-            "p.qbsothermodule.listProp: [\"first\",\"second\"]"), m_qbsStdout);
-}
-
 void TestBlackbox::pseudoMultiplexing()
 {
     // This is "pseudo-multiplexing" on all platforms that initialize qbs.architectures
@@ -6163,162 +6162,6 @@ 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()
-{
-    QFETCH(QStringList, arguments);
-    QFETCH(QString, firstProp);
-    QFETCH(QString, secondProp);
-
-    QDir::setCurrent(testDataDir + "/qbs-module-providers");
-
-    QbsRunParameters params("resolve");
-    params.arguments = arguments;
-    QCOMPARE(runQbs(params), 0);
-    QVERIFY2(m_qbsStdout.contains(("p1.qbsmetatestmodule.prop: " + firstProp).toUtf8()),
-             m_qbsStdout);
-    QVERIFY2(m_qbsStdout.contains(("p1.qbsothermodule.prop: " + secondProp).toUtf8()),
-             m_qbsStdout);
-    QVERIFY2(m_qbsStdout.contains(("p2.qbsmetatestmodule.prop: " + firstProp).toUtf8()),
-             m_qbsStdout);
-    QVERIFY2(m_qbsStdout.contains(("p2.qbsothermodule.prop: " + secondProp).toUtf8()),
-             m_qbsStdout);
-}
-
-void TestBlackbox::qbsModuleProviders_data()
-{
-    QTest::addColumn<QStringList>("arguments");
-    QTest::addColumn<QString>("firstProp");
-    QTest::addColumn<QString>("secondProp");
-
-    QTest::newRow("default") << QStringList() << "from_provider_a" << "undefined";
-    QTest::newRow("override")
-            << QStringList("projects.project.qbsModuleProviders:provider_b")
-            << "from_provider_b"
-            << "from_provider_b";
-    QTest::newRow("override list a")
-            << QStringList("projects.project.qbsModuleProviders:provider_a,provider_b")
-            << "from_provider_a"
-            << "from_provider_b";
-    QTest::newRow("override list b")
-            << QStringList("projects.project.qbsModuleProviders:provider_b,provider_a")
-            << "from_provider_b"
-            << "from_provider_b";
-}
-
-// Tests possible use-cases how to override providers from command-line
-void TestBlackbox::qbsModuleProvidersCliOverride()
-{
-    QFETCH(QStringList, arguments);
-    QFETCH(QString, propertyValue);
-
-    QDir::setCurrent(testDataDir + "/qbs-module-providers-cli-override");
-
-    QbsRunParameters params("resolve");
-    params.arguments = arguments;
-    QCOMPARE(runQbs(params), 0);
-    QVERIFY2(m_qbsStdout.contains(("qbsmetatestmodule.prop: " + propertyValue).toUtf8()),
-             m_qbsStdout);
-}
-
-void TestBlackbox::qbsModuleProvidersCliOverride_data()
-{
-    QTest::addColumn<QStringList>("arguments");
-    QTest::addColumn<QString>("propertyValue");
-
-    QTest::newRow("default") << QStringList() << "undefined";
-    QTest::newRow("project-wide")
-            << QStringList("project.qbsModuleProviders:provider_a")
-            << "from_provider_a";
-    QTest::newRow("concrete project")
-            << QStringList("projects.innerProject.qbsModuleProviders:provider_a")
-            << "from_provider_a";
-    QTest::newRow("concrete product")
-            << QStringList("products.product.qbsModuleProviders:provider_a")
-            << "from_provider_a";
-    QTest::newRow("concrete project override project-wide")
-            << QStringList({
-                    "project.qbsModuleProviders:provider_a",
-                    "projects.innerProject.qbsModuleProviders:provider_b"})
-            << "from_provider_b";
-    QTest::newRow("concrete product override project-wide")
-            << QStringList({
-                    "project.qbsModuleProviders:provider_a",
-                    "products.product.qbsModuleProviders:provider_b"})
-            << "from_provider_b";
-}
-
-// Tests whether scoped providers can be used as named, i.e. new provider machinery
-// is compatible with the old one
-void TestBlackbox::qbsModuleProvidersCompatibility()
-{
-    QFETCH(QStringList, arguments);
-    QFETCH(QString, propertyValue);
-
-    QDir::setCurrent(testDataDir + "/qbs-module-providers-compatibility");
-
-    QbsRunParameters params("resolve");
-    params.arguments = arguments;
-    QCOMPARE(runQbs(params), 0);
-    QVERIFY2(m_qbsStdout.contains(("qbsmetatestmodule.prop: " + propertyValue).toUtf8()),
-             m_qbsStdout);
-}
-
-void TestBlackbox::qbsModuleProvidersCompatibility_data()
-{
-    QTest::addColumn<QStringList>("arguments");
-    QTest::addColumn<QString>("propertyValue");
-
-    QTest::newRow("default") << QStringList() << "from_scoped_provider";
-    QTest::newRow("scoped by name") << QStringList("project.qbsModuleProviders:qbsmetatestmodule") << "from_scoped_provider";
-    QTest::newRow("named") << QStringList("project.qbsModuleProviders:named_provider") << "from_named_provider";
-}
-
-void TestBlackbox::qbspkgconfigModuleProvider()
-{
-    QDir::setCurrent(testDataDir + "/qbspkgconfig-module-provider/libs");
-    rmDirR(relativeBuildDir());
-
-    const auto commonParams = QbsRunParameters(QStringLiteral("install"), {
-            QStringLiteral("--install-root"),
-            QStringLiteral("install-root")
-    });
-    auto dynamicParams = commonParams;
-    dynamicParams.arguments << "config:library" << "projects.libs.isBundle:false";
-    QCOMPARE(runQbs(dynamicParams), 0);
-
-    QDir::setCurrent(testDataDir + "/qbspkgconfig-module-provider");
-    rmDirR(relativeBuildDir());
-
-    const auto sysroot = testDataDir + "/qbspkgconfig-module-provider/libs/install-root";
-
-    QbsRunParameters params;
-    params.arguments << "moduleProviders.qbspkgconfig.sysroot:" + sysroot;
-    QCOMPARE(runQbs(params), 0);
-}
-
 static QJsonObject getNextSessionPacket(QProcess &session, QByteArray &data)
 {
     int totalSize = -1;
@@ -8024,112 +7867,6 @@ void TestBlackbox::maximumCxxLanguageVersion()
              m_qbsStdout.constData());
 }
 
-void TestBlackbox::moduleProviders()
-{
-    QDir::setCurrent(testDataDir + "/module-providers");
-
-    // Resolving in dry-run mode must not leave any data behind.
-    QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList("-n"))), 0);
-    if (m_qbsStdout.contains("targetPlatform differs from hostPlatform"))
-        QSKIP("Cannot run binaries in cross-compiled build");
-    QCOMPARE(m_qbsStdout.count("Running setup script for mygenerator"), 2);
-    QVERIFY(!QFile::exists(relativeBuildDir()));
-
-    // Initial build.
-    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app1"})), 0);
-    QVERIFY(QFile::exists(relativeBuildDir()));
-    QCOMPARE(m_qbsStdout.count("Running setup script for mygenerator"), 2);
-    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
-    QVERIFY2(m_qbsStdout.contains("The MY_DEFINE is app1"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app2"})), 0);
-    QVERIFY2(m_qbsStdout.contains("The letters are Z and Y"), m_qbsStdout.constData());
-    QVERIFY2(m_qbsStdout.contains("The MY_DEFINE is app2"), m_qbsStdout.constData());
-
-    // Rebuild with overridden module provider config. The output for product 2 must change,
-    // but no setup script must be re-run, because both config values have already been
-    // handled in the first run.
-    const QStringList resolveArgs("moduleProviders.mygenerator.chooseLettersFrom:beginning");
-    QCOMPARE(runQbs(QbsRunParameters("resolve", resolveArgs)), 0);
-    QVERIFY2(!m_qbsStdout.contains("Running setup script"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app1"})), 0);
-    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app2"})), 0);
-    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
-
-    // Forcing Probe execution triggers a re-run of the setup script. But only once,
-    // because the module provider config is the same now.
-    QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList(resolveArgs)
-                                     << "--force-probe-execution")), 0);
-    QCOMPARE(m_qbsStdout.count("Running setup script for mygenerator"), 1);
-    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app1"})), 0);
-    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app2"})), 0);
-    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
-
-    // Now re-run without the module provider config override. Again, the setup script must
-    // run once, for the config value that was not present in the last run.
-    QCOMPARE(runQbs(QbsRunParameters("resolve")), 0);
-    QCOMPARE(m_qbsStdout.count("Running setup script for mygenerator"), 1);
-    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app1"})), 0);
-    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
-    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app2"})), 0);
-    QVERIFY2(m_qbsStdout.contains("The letters are Z and Y"), m_qbsStdout.constData());
-}
-
-void TestBlackbox::fallbackModuleProvider_data()
-{
-    QTest::addColumn<bool>("fallbacksEnabledGlobally");
-    QTest::addColumn<bool>("fallbacksEnabledInProduct");
-    QTest::addColumn<QStringList>("pkgConfigLibDirs");
-    QTest::addColumn<bool>("successExpected");
-    QTest::newRow("without custom lib dir, fallbacks disabled globally and in product")
-            << false << false << QStringList() << false;
-    QTest::newRow("without custom lib dir, fallbacks disabled globally, enabled in product")
-            << false << true << QStringList() << false;
-    QTest::newRow("without custom lib dir, fallbacks enabled globally, disabled in product")
-            << true << false << QStringList() << false;
-    QTest::newRow("without custom lib dir, fallbacks enabled globally and in product")
-            << true << true << QStringList() << false;
-    QTest::newRow("with custom lib dir, fallbacks disabled globally and in product")
-            << false << false << QStringList(testDataDir + "/fallback-module-provider/libdir")
-            << false;
-    QTest::newRow("with custom lib dir, fallbacks disabled globally, enabled in product")
-            << false << true << QStringList(testDataDir + "/fallback-module-provider/libdir")
-            << false;
-    QTest::newRow("with custom lib dir, fallbacks enabled globally, disabled in product")
-            << true << false << QStringList(testDataDir + "/fallback-module-provider/libdir")
-            << false;
-    QTest::newRow("with custom lib dir, fallbacks enabled globally and in product")
-            << true << true << QStringList(testDataDir + "/fallback-module-provider/libdir")
-            << true;
-}
-
-void TestBlackbox::fallbackModuleProvider()
-{
-    QFETCH(bool, fallbacksEnabledInProduct);
-    QFETCH(bool, fallbacksEnabledGlobally);
-    QFETCH(QStringList, pkgConfigLibDirs);
-    QFETCH(bool, successExpected);
-
-    QDir::setCurrent(testDataDir + "/fallback-module-provider");
-    static const auto b2s = [](bool b) { return QString(b ? "true" : "false"); };
-    QbsRunParameters resolveParams("resolve",
-        QStringList{"modules.pkgconfig.libDirs:" + pkgConfigLibDirs.join(','),
-                    "products.p.fallbacksEnabled:" + b2s(fallbacksEnabledInProduct),
-                    "--force-probe-execution"});
-    if (!fallbacksEnabledGlobally)
-        resolveParams.arguments << "--no-fallback-module-provider";
-    QCOMPARE(runQbs(resolveParams), 0);
-    const bool pkgConfigPresent = m_qbsStdout.contains("pkg-config present: true");
-    const bool pkgConfigNotPresent = m_qbsStdout.contains("pkg-config present: false");
-    QVERIFY(pkgConfigPresent != pkgConfigNotPresent);
-    if (pkgConfigNotPresent)
-        successExpected = false;
-    QbsRunParameters buildParams;
-    buildParams.expectFailure = !successExpected;
-    QCOMPARE(runQbs(buildParams) == 0, successExpected);
-}
-
 void TestBlackbox::minimumSystemVersion()
 {
     rmDirR(relativeBuildDir());
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 8f9bfc984..9abc84897 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -90,6 +90,8 @@ private slots:
     void cxxLanguageVersion_data();
     void conanfileProbe_data();
     void conanfileProbe();
+    void conflictingPropertyValues_data();
+    void conflictingPropertyValues();
     void cpuFeatures();
     void dependenciesProperty();
     void dependencyScanningLoop();
@@ -195,9 +197,6 @@ private slots:
     void makefileGenerator();
     void maximumCLanguageVersion();
     void maximumCxxLanguageVersion();
-    void moduleProviders();
-    void fallbackModuleProvider_data();
-    void fallbackModuleProvider();
     void minimumSystemVersion();
     void minimumSystemVersion_data();
     void missingBuildGraph();
@@ -242,7 +241,6 @@ private slots:
     void probeProperties();
     void probesAndShadowProducts();
     void probeInExportedModule();
-    void probeInModuleProvider();
     void probesAndArrayProperties();
     void probesInNestedModules();
     void productDependenciesByType();
@@ -258,19 +256,10 @@ private slots:
     void protobuf_data();
     void protobuf();
     void protobufLibraryInstall();
-    void providersProperties();
     void pseudoMultiplexing();
     void qbsConfig();
     void qbsConfigAddProfile();
     void qbsConfigAddProfile_data();
-    void qbsModulePropertiesInProviders();
-    void qbsModuleProviders();
-    void qbsModuleProviders_data();
-    void qbsModuleProvidersCliOverride();
-    void qbsModuleProvidersCliOverride_data();
-    void qbsModuleProvidersCompatibility();
-    void qbsModuleProvidersCompatibility_data();
-    void qbspkgconfigModuleProvider();
     void qbsSession();
     void qbsVersion();
     void qtBug51237();
diff --git a/tests/auto/blackbox/tst_blackboxproviders.cpp b/tests/auto/blackbox/tst_blackboxproviders.cpp
new file mode 100644
index 000000000..ceb413510
--- /dev/null
+++ b/tests/auto/blackbox/tst_blackboxproviders.cpp
@@ -0,0 +1,368 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 Ivan Komissarov (abbapoh@gmail.com)
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms and
+** conditions see http://www.qt.io/terms-conditions. For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights.  These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "tst_blackboxproviders.h"
+
+#include "../shared.h"
+
+// #include <tools/hostosinfo.h>
+// #include <tools/profile.h>
+// #include <tools/qttools.h>
+
+// #include <QtCore/qdir.h>
+// #include <QtCore/qregularexpression.h>
+
+// using qbs::Internal::HostOsInfo;
+// using qbs::Profile;
+
+#define WAIT_FOR_NEW_TIMESTAMP() waitForNewTimestamp(testDataDir)
+
+TestBlackboxProviders::TestBlackboxProviders()
+    : TestBlackboxBase(SRCDIR "/testdata-providers", "blackbox-providers")
+{
+}
+
+void TestBlackboxProviders::fallbackModuleProvider_data()
+{
+    QTest::addColumn<bool>("fallbacksEnabledGlobally");
+    QTest::addColumn<bool>("fallbacksEnabledInProduct");
+    QTest::addColumn<QStringList>("pkgConfigLibDirs");
+    QTest::addColumn<bool>("successExpected");
+    QTest::newRow("without custom lib dir, fallbacks disabled globally and in product")
+            << false << false << QStringList() << false;
+    QTest::newRow("without custom lib dir, fallbacks disabled globally, enabled in product")
+            << false << true << QStringList() << false;
+    QTest::newRow("without custom lib dir, fallbacks enabled globally, disabled in product")
+            << true << false << QStringList() << false;
+    QTest::newRow("without custom lib dir, fallbacks enabled globally and in product")
+            << true << true << QStringList() << false;
+    QTest::newRow("with custom lib dir, fallbacks disabled globally and in product")
+            << false << false << QStringList(testDataDir + "/fallback-module-provider/libdir")
+            << false;
+    QTest::newRow("with custom lib dir, fallbacks disabled globally, enabled in product")
+            << false << true << QStringList(testDataDir + "/fallback-module-provider/libdir")
+            << false;
+    QTest::newRow("with custom lib dir, fallbacks enabled globally, disabled in product")
+            << true << false << QStringList(testDataDir + "/fallback-module-provider/libdir")
+            << false;
+    QTest::newRow("with custom lib dir, fallbacks enabled globally and in product")
+            << true << true << QStringList(testDataDir + "/fallback-module-provider/libdir")
+            << true;
+}
+
+void TestBlackboxProviders::fallbackModuleProvider()
+{
+    QFETCH(bool, fallbacksEnabledInProduct);
+    QFETCH(bool, fallbacksEnabledGlobally);
+    QFETCH(QStringList, pkgConfigLibDirs);
+    QFETCH(bool, successExpected);
+
+    QDir::setCurrent(testDataDir + "/fallback-module-provider");
+    static const auto b2s = [](bool b) { return QString(b ? "true" : "false"); };
+    QbsRunParameters resolveParams("resolve",
+        QStringList{"modules.pkgconfig.libDirs:" + pkgConfigLibDirs.join(','),
+                    "products.p.fallbacksEnabled:" + b2s(fallbacksEnabledInProduct),
+                    "--force-probe-execution"});
+    if (!fallbacksEnabledGlobally)
+        resolveParams.arguments << "--no-fallback-module-provider";
+    QCOMPARE(runQbs(resolveParams), 0);
+    const bool pkgConfigPresent = m_qbsStdout.contains("pkg-config present: true");
+    const bool pkgConfigNotPresent = m_qbsStdout.contains("pkg-config present: false");
+    QVERIFY(pkgConfigPresent != pkgConfigNotPresent);
+    if (pkgConfigNotPresent)
+        successExpected = false;
+    QbsRunParameters buildParams;
+    buildParams.expectFailure = !successExpected;
+    QCOMPARE(runQbs(buildParams) == 0, successExpected);
+}
+
+void TestBlackboxProviders::moduleProviders()
+{
+    QDir::setCurrent(testDataDir + "/module-providers");
+
+    // Resolving in dry-run mode must not leave any data behind.
+    QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList("-n"))), 0);
+    if (m_qbsStdout.contains("targetPlatform differs from hostPlatform"))
+        QSKIP("Cannot run binaries in cross-compiled build");
+    QCOMPARE(m_qbsStdout.count("Running setup script for mygenerator"), 2);
+    QVERIFY(!QFile::exists(relativeBuildDir()));
+
+    // Initial build.
+    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app1"})), 0);
+    QVERIFY(QFile::exists(relativeBuildDir()));
+    QCOMPARE(m_qbsStdout.count("Running setup script for mygenerator"), 2);
+    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
+    QVERIFY2(m_qbsStdout.contains("The MY_DEFINE is app1"), m_qbsStdout.constData());
+    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app2"})), 0);
+    QVERIFY2(m_qbsStdout.contains("The letters are Z and Y"), m_qbsStdout.constData());
+    QVERIFY2(m_qbsStdout.contains("The MY_DEFINE is app2"), m_qbsStdout.constData());
+
+    // Rebuild with overridden module provider config. The output for product 2 must change,
+    // but no setup script must be re-run, because both config values have already been
+    // handled in the first run.
+    const QStringList resolveArgs("moduleProviders.mygenerator.chooseLettersFrom:beginning");
+    QCOMPARE(runQbs(QbsRunParameters("resolve", resolveArgs)), 0);
+    QVERIFY2(!m_qbsStdout.contains("Running setup script"), m_qbsStdout.constData());
+    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app1"})), 0);
+    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
+    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app2"})), 0);
+    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
+
+    // Forcing Probe execution triggers a re-run of the setup script. But only once,
+    // because the module provider config is the same now.
+    QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList(resolveArgs)
+                                     << "--force-probe-execution")), 0);
+    QCOMPARE(m_qbsStdout.count("Running setup script for mygenerator"), 1);
+    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app1"})), 0);
+    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
+    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app2"})), 0);
+    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
+
+    // Now re-run without the module provider config override. Again, the setup script must
+    // run once, for the config value that was not present in the last run.
+    QCOMPARE(runQbs(QbsRunParameters("resolve")), 0);
+    QCOMPARE(m_qbsStdout.count("Running setup script for mygenerator"), 1);
+    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app1"})), 0);
+    QVERIFY2(m_qbsStdout.contains("The letters are A and B"), m_qbsStdout.constData());
+    QCOMPARE(runQbs(QbsRunParameters("run", QStringList{"-p", "app2"})), 0);
+    QVERIFY2(m_qbsStdout.contains("The letters are Z and Y"), m_qbsStdout.constData());
+}
+
+// Checks regression - when loading 2 modules from the same provider, the second module should
+// come from provider cache
+void TestBlackboxProviders::moduleProvidersCache()
+{
+    QDir::setCurrent(testDataDir + "/module-providers-cache");
+
+    QbsRunParameters params("resolve", {"-v"});
+    QCOMPARE(runQbs(params), 0);
+    const auto qbsmetatestmoduleMessage = "Re-checking for module \"qbsmetatestmodule\" with "
+                                          "newly added search paths from module provider";
+    const auto qbsothermoduleMessage = "Re-checking for module \"qbsothermodule\" with "
+                                       "newly added search paths from module provider";
+    QCOMPARE(m_qbsStderr.count(qbsmetatestmoduleMessage), 1);
+    QCOMPARE(m_qbsStderr.count(qbsothermoduleMessage), 1);
+    QCOMPARE(m_qbsStderr.count("Re-using provider \"provider_a\" from cache"), 1);
+
+    // We didn't change providers, so both modules should come from cache.
+    params.arguments << "project.dummyProp:value";
+    QCOMPARE(runQbs(params), 0);
+    QCOMPARE(m_qbsStderr.count(qbsmetatestmoduleMessage), 1);
+    QCOMPARE(m_qbsStderr.count(qbsothermoduleMessage), 1);
+    QCOMPARE(m_qbsStderr.count("Re-using provider \"provider_a\" from cache"), 2);
+}
+
+void TestBlackboxProviders::probeInModuleProvider()
+{
+    QDir::setCurrent(testDataDir + "/probe-in-module-provider");
+
+    QbsRunParameters params;
+    params.command = "build";
+    params.arguments << "--force-probe-execution";
+    QCOMPARE(runQbs(params), 0);
+    QVERIFY2(m_qbsStdout.contains("Running probe"), m_qbsStdout);
+    QVERIFY2(m_qbsStdout.contains("p.qbsmetatestmodule.boolProp: true"), m_qbsStdout);
+    WAIT_FOR_NEW_TIMESTAMP();
+    touch("probe-in-module-provider.qbs");
+    QCOMPARE(runQbs(), 0);
+    QVERIFY2(m_qbsStdout.contains("p.qbsmetatestmodule.boolProp: true"), m_qbsStdout);
+    QVERIFY2(!m_qbsStdout.contains("Running probe"), m_qbsStdout);
+}
+
+// Tests whether it is possible to set providers properties in a Product or from command-line
+void TestBlackboxProviders::providersProperties()
+{
+    QDir::setCurrent(testDataDir + "/providers-properties");
+
+    QbsRunParameters params("build");
+    params.arguments = QStringList("moduleProviders.provider_b.someProp: \"first,second\"");
+    QCOMPARE(runQbs(params), 0);
+    QVERIFY2(m_qbsStdout.contains("p.qbsmetatestmodule.listProp: [\"someValue\"]"), m_qbsStdout);
+    QVERIFY2(m_qbsStdout.contains(
+            "p.qbsothermodule.listProp: [\"first\",\"second\"]"), m_qbsStdout);
+}
+
+// checks that we can set qbs module properties in providers and provider cache works corectly
+void TestBlackboxProviders::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);
+}
+
+void TestBlackboxProviders::qbsModuleProviders_data()
+{
+    QTest::addColumn<QStringList>("arguments");
+    QTest::addColumn<QString>("firstProp");
+    QTest::addColumn<QString>("secondProp");
+
+    QTest::newRow("default") << QStringList() << "from_provider_a" << "undefined";
+    QTest::newRow("override")
+            << QStringList("projects.project.qbsModuleProviders:provider_b")
+            << "from_provider_b"
+            << "from_provider_b";
+    QTest::newRow("override list a")
+            << QStringList("projects.project.qbsModuleProviders:provider_a,provider_b")
+            << "from_provider_a"
+            << "from_provider_b";
+    QTest::newRow("override list b")
+            << QStringList("projects.project.qbsModuleProviders:provider_b,provider_a")
+            << "from_provider_b"
+            << "from_provider_b";
+}
+
+// Tests whether it is possible to set qbsModuleProviders in Product and Project items
+// and that the order of providers results in correct priority
+void TestBlackboxProviders::qbsModuleProviders()
+{
+    QFETCH(QStringList, arguments);
+    QFETCH(QString, firstProp);
+    QFETCH(QString, secondProp);
+
+    QDir::setCurrent(testDataDir + "/qbs-module-providers");
+
+    QbsRunParameters params("resolve");
+    params.arguments = arguments;
+    QCOMPARE(runQbs(params), 0);
+    QVERIFY2(m_qbsStdout.contains(("p1.qbsmetatestmodule.prop: " + firstProp).toUtf8()),
+             m_qbsStdout);
+    QVERIFY2(m_qbsStdout.contains(("p1.qbsothermodule.prop: " + secondProp).toUtf8()),
+             m_qbsStdout);
+    QVERIFY2(m_qbsStdout.contains(("p2.qbsmetatestmodule.prop: " + firstProp).toUtf8()),
+             m_qbsStdout);
+    QVERIFY2(m_qbsStdout.contains(("p2.qbsothermodule.prop: " + secondProp).toUtf8()),
+             m_qbsStdout);
+}
+
+void TestBlackboxProviders::qbsModuleProvidersCliOverride_data()
+{
+    QTest::addColumn<QStringList>("arguments");
+    QTest::addColumn<QString>("propertyValue");
+
+    QTest::newRow("default") << QStringList() << "undefined";
+    QTest::newRow("project-wide")
+            << QStringList("project.qbsModuleProviders:provider_a")
+            << "from_provider_a";
+    QTest::newRow("concrete project")
+            << QStringList("projects.innerProject.qbsModuleProviders:provider_a")
+            << "from_provider_a";
+    QTest::newRow("concrete product")
+            << QStringList("products.product.qbsModuleProviders:provider_a")
+            << "from_provider_a";
+    QTest::newRow("concrete project override project-wide")
+            << QStringList({
+                    "project.qbsModuleProviders:provider_a",
+                    "projects.innerProject.qbsModuleProviders:provider_b"})
+            << "from_provider_b";
+    QTest::newRow("concrete product override project-wide")
+            << QStringList({
+                    "project.qbsModuleProviders:provider_a",
+                    "products.product.qbsModuleProviders:provider_b"})
+            << "from_provider_b";
+}
+
+// Tests possible use-cases how to override providers from command-line
+void TestBlackboxProviders::qbsModuleProvidersCliOverride()
+{
+    QFETCH(QStringList, arguments);
+    QFETCH(QString, propertyValue);
+
+    QDir::setCurrent(testDataDir + "/qbs-module-providers-cli-override");
+
+    QbsRunParameters params("resolve");
+    params.arguments = arguments;
+    QCOMPARE(runQbs(params), 0);
+    QVERIFY2(m_qbsStdout.contains(("qbsmetatestmodule.prop: " + propertyValue).toUtf8()),
+             m_qbsStdout);
+}
+
+void TestBlackboxProviders::qbsModuleProvidersCompatibility_data()
+{
+    QTest::addColumn<QStringList>("arguments");
+    QTest::addColumn<QString>("propertyValue");
+
+    QTest::newRow("default") << QStringList() << "from_scoped_provider";
+    QTest::newRow("scoped by name") << QStringList("project.qbsModuleProviders:qbsmetatestmodule") << "from_scoped_provider";
+    QTest::newRow("named") << QStringList("project.qbsModuleProviders:named_provider") << "from_named_provider";
+}
+
+// Tests whether scoped providers can be used as named, i.e. new provider machinery
+// is compatible with the old one
+void TestBlackboxProviders::qbsModuleProvidersCompatibility()
+{
+    QFETCH(QStringList, arguments);
+    QFETCH(QString, propertyValue);
+
+    QDir::setCurrent(testDataDir + "/qbs-module-providers-compatibility");
+
+    QbsRunParameters params("resolve");
+    params.arguments = arguments;
+    QCOMPARE(runQbs(params), 0);
+    QVERIFY2(m_qbsStdout.contains(("qbsmetatestmodule.prop: " + propertyValue).toUtf8()),
+             m_qbsStdout);
+}
+
+void TestBlackboxProviders::qbspkgconfigModuleProvider()
+{
+    QDir::setCurrent(testDataDir + "/qbspkgconfig-module-provider/libs");
+    rmDirR(relativeBuildDir());
+
+    const auto commonParams = QbsRunParameters(QStringLiteral("install"), {
+            QStringLiteral("--install-root"),
+            QStringLiteral("install-root")
+    });
+    auto dynamicParams = commonParams;
+    dynamicParams.arguments << "config:library" << "projects.libs.isBundle:false";
+    QCOMPARE(runQbs(dynamicParams), 0);
+
+    QDir::setCurrent(testDataDir + "/qbspkgconfig-module-provider");
+    rmDirR(relativeBuildDir());
+
+    const auto sysroot = testDataDir + "/qbspkgconfig-module-provider/libs/install-root";
+
+    QbsRunParameters params;
+    params.arguments << "moduleProviders.qbspkgconfig.sysroot:" + sysroot;
+    QCOMPARE(runQbs(params), 0);
+}
+
+QTEST_MAIN(TestBlackboxProviders)
diff --git a/tests/auto/blackbox/tst_blackboxproviders.h b/tests/auto/blackbox/tst_blackboxproviders.h
new file mode 100644
index 000000000..017cc1c5e
--- /dev/null
+++ b/tests/auto/blackbox/tst_blackboxproviders.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 Ivan Komissarov (abbapoh@gmail.com)
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms and
+** conditions see http://www.qt.io/terms-conditions. For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights.  These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef TST_BLACKBOXPROVIDERS_H
+#define TST_BLACKBOXPROVIDERS_H
+
+#include "tst_blackboxbase.h"
+
+class TestBlackboxProviders : public TestBlackboxBase
+{
+    Q_OBJECT
+
+public:
+    TestBlackboxProviders();
+
+private slots:
+    void fallbackModuleProvider_data();
+    void fallbackModuleProvider();
+    void moduleProviders();
+    void moduleProvidersCache();
+    void probeInModuleProvider();
+    void providersProperties();
+    void qbsModulePropertiesInProviders();
+    void qbsModuleProviders_data();
+    void qbsModuleProviders();
+    void qbsModuleProvidersCliOverride();
+    void qbsModuleProvidersCliOverride_data();
+    void qbsModuleProvidersCompatibility();
+    void qbsModuleProvidersCompatibility_data();
+    void qbspkgconfigModuleProvider();
+};
+
+#endif // TST_BLACKBOXPROVIDERS_H