Remove the fallback provider

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

3 files changed, 2 insertions, 64 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 917d7436c..c62fdbca0 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -6058,12 +6058,9 @@ void TestBlackbox::protobuf_data()
     QTest::addColumn<QStringList>("properties");
     QTest::addColumn<bool>("hasModules");
     QTest::addColumn<bool>("successExpected");
-    QTest::newRow("cpp-fallback") << QString("addressbook_cpp.qbs") << QStringList() << true << true;
     QTest::newRow("cpp-pkgconfig")
         << QString("addressbook_cpp.qbs")
-        << QStringList({"project.qbsModuleProviders:qbspkgconfig", "--no-fallback-module-provider"})
-        << true
-        << true;
+        << QStringList({"project.qbsModuleProviders:qbspkgconfig"}) << true << true;
     QTest::newRow("objc") << QString("addressbook_objc.qbs") << QStringList() << false << true;
     QTest::newRow("nanopb") << QString("addressbook_nanopb.qbs") << QStringList() << false << true;
     QTest::newRow("import") << QString("import.qbs") << QStringList() << true << true;
@@ -8632,10 +8629,7 @@ void TestBlackbox::grpc_data()
     QTest::addColumn<QStringList>("arguments");
     QTest::addColumn<bool>("hasModules");
 
-    QTest::newRow("cpp-fallback") << QString("grpc_cpp.qbs") << QStringList() << true;
-
-    QStringList pkgConfigArgs({
-        "project.qbsModuleProviders:qbspkgconfig", "--no-fallback-module-provider"});
+    QStringList pkgConfigArgs({"project.qbsModuleProviders:qbspkgconfig"});
     // on macOS, openSSL is hidden from pkg-config by default
     if (qbs::Internal::HostOsInfo::isMacosHost()) {
         pkgConfigArgs
diff --git a/tests/auto/blackbox/tst_blackboxproviders.cpp b/tests/auto/blackbox/tst_blackboxproviders.cpp
index 3642ded03..3d64d32d5 100644
--- a/tests/auto/blackbox/tst_blackboxproviders.cpp
+++ b/tests/auto/blackbox/tst_blackboxproviders.cpp
@@ -87,60 +87,6 @@ void TestBlackboxProviders::brokenProvider()
     QCOMPARE(m_qbsStderr.count("This provider is broken"), 2);
 }
 
-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");
diff --git a/tests/auto/blackbox/tst_blackboxproviders.h b/tests/auto/blackbox/tst_blackboxproviders.h
index e8477de51..dd0039013 100644
--- a/tests/auto/blackbox/tst_blackboxproviders.h
+++ b/tests/auto/blackbox/tst_blackboxproviders.h
@@ -44,8 +44,6 @@ private slots:
     void allowedValues();
     void allowedValues_data();
     void brokenProvider();
-    void fallbackModuleProvider_data();
-    void fallbackModuleProvider();
     void moduleProviders();
     void moduleProvidersCache();
     void nonEagerModuleProvider();