Tests: Remove some dependencies on profiles

Various conditional tests were erroneously skipped when run without an
explicit profile. Fix this by checking the actual toolchain used instead
of profile contents.

Change-Id: I9cc589f038d76112998a126cce4bf314a57c742e
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

14 files changed, 180 insertions, 117 deletions

diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs
index 4ba829a5b..0c86d05c6 100644
--- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs
+++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs
@@ -40,6 +40,11 @@ Project {
         name: "static2"
         files: [ "static2.cpp", "static2.h" ]
         Depends { name: "cpp" }
+        Probe {
+            id: tcPrinter
+            property bool isGcc: qbs.toolchain.contains("gcc")
+            configure: { console.info("is gcc: " + isGcc); }
+        }
     }
 }
 
diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs
index 1bcc2876f..c30cf40f9 100644
--- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs
+++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs
@@ -16,7 +16,11 @@ Project {
             id: osCheck
             property bool isNormalUnix: qbs.targetOS.includes("unix")
                                         && !qbs.targetOS.includes("darwin")
-            configure: { console.info("is normal unix: " + (isNormalUnix ? "yes" : "no")); }
+            property bool isGcc: qbs.toolchain.contains("gcc")
+            configure: {
+                console.info("is normal unix: " + (isNormalUnix ? "yes" : "no"));
+                console.info("is gcc: " + isGcc);
+            }
         }
     }
 
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp
index c07d358c2..78f11a117 100644
--- a/tests/auto/api/tst_api.cpp
+++ b/tests/auto/api/tst_api.cpp
@@ -1550,27 +1550,30 @@ void TestApi::linkDynamicAndStaticLibs()
     BuildDescriptionReceiver bdr;
     qbs::BuildOptions options;
     options.setEchoMode(qbs::CommandEchoModeCommandLine);
+    m_logSink->output.clear();
     const qbs::ErrorInfo errorInfo = doBuildProject("link-dynamiclibs-staticlibs", &bdr, nullptr,
                                                     nullptr, options);
     VERIFY_NO_ERROR(errorInfo);
 
+    const bool isGcc = m_logSink->output.contains("is gcc: true");
+    const bool isNotGcc = m_logSink->output.contains("is gcc: false");
+    if (isNotGcc)
+        QSKIP("The remainder of this test applies only to GCC");
+    QVERIFY(isGcc);
+
     // The dependent static libs should not appear in the link command for the executable.
-    const SettingsPtr s = settings();
-    const qbs::Profile buildProfile(profileName(), s.get());
-    if (profileToolchain(buildProfile).contains("gcc")) {
-        static const std::regex appLinkCmdRex(" -o [^ ]*/HelloWorld" QBS_HOST_EXE_SUFFIX " ");
-        QString appLinkCmd;
-        for (const QString &line : std::as_const(bdr.descriptionLines)) {
-            const auto ln = line.toStdString();
-            if (std::regex_search(ln, appLinkCmdRex)) {
-                appLinkCmd = line;
-                break;
-            }
+    static const std::regex appLinkCmdRex(" -o [^ ]*/HelloWorld" QBS_HOST_EXE_SUFFIX " ");
+    QString appLinkCmd;
+    for (const QString &line : std::as_const(bdr.descriptionLines)) {
+        const auto ln = line.toStdString();
+        if (std::regex_search(ln, appLinkCmdRex)) {
+            appLinkCmd = line;
+            break;
         }
-        QVERIFY(!appLinkCmd.isEmpty());
-        QVERIFY(!appLinkCmd.contains("static1"));
-        QVERIFY(!appLinkCmd.contains("static2"));
     }
+    QVERIFY(!appLinkCmd.isEmpty());
+    QVERIFY(!appLinkCmd.contains("static1"));
+    QVERIFY(!appLinkCmd.contains("static2"));
 }
 
 void TestApi::linkStaticAndDynamicLibs()
@@ -1585,31 +1588,32 @@ void TestApi::linkStaticAndDynamicLibs()
     const bool isNormalUnix = m_logSink->output.contains("is normal unix: yes");
     const bool isNotNormalUnix = m_logSink->output.contains("is normal unix: no");
     QVERIFY2(isNormalUnix != isNotNormalUnix, qPrintable(m_logSink->output));
+    const bool isGcc = m_logSink->output.contains("is gcc: true");
+    const bool isNotGcc = m_logSink->output.contains("is gcc: false");
+    if (isNotGcc)
+        QSKIP("The remainder of this test applies only to GCC");
+    QVERIFY(isGcc);
 
     // The dependencies libdynamic1.so and libstatic2.a must not appear in the link command for the
     // executable. The -rpath-link line for libdynamic1.so must be there.
-    const SettingsPtr s = settings();
-    const qbs::Profile buildProfile(profileName(), s.get());
-    if (profileToolchain(buildProfile).contains("gcc")) {
-        static const std::regex appLinkCmdRex(" -o [^ ]*/HelloWorld" QBS_HOST_EXE_SUFFIX " ");
-        QString appLinkCmd;
-        for (const QString &line : std::as_const(bdr.descriptionLines)) {
-            const auto ln = line.toStdString();
-            if (std::regex_search(ln, appLinkCmdRex)) {
-                appLinkCmd = line;
-                break;
-            }
-        }
-        QVERIFY(!appLinkCmd.isEmpty());
-        if (isNormalUnix) {
-            const std::regex rpathLinkRex("-rpath-link=\\S*/"
-                                          + relativeProductBuildDir("dynamic2").toStdString());
-            const auto ln = appLinkCmd.toStdString();
-            QVERIFY(std::regex_search(ln, rpathLinkRex));
+    static const std::regex appLinkCmdRex(" -o [^ ]*/HelloWorld" QBS_HOST_EXE_SUFFIX " ");
+    QString appLinkCmd;
+    for (const QString &line : std::as_const(bdr.descriptionLines)) {
+        const auto ln = line.toStdString();
+        if (std::regex_search(ln, appLinkCmdRex)) {
+            appLinkCmd = line;
+            break;
         }
-        QVERIFY(!appLinkCmd.contains("libstatic2.a"));
-        QVERIFY(!appLinkCmd.contains("libdynamic2.so"));
     }
+    QVERIFY(!appLinkCmd.isEmpty());
+    if (isNormalUnix) {
+        const std::regex rpathLinkRex("-rpath-link=\\S*/"
+                                      + relativeProductBuildDir("dynamic2").toStdString());
+        const auto ln = appLinkCmd.toStdString();
+        QVERIFY(std::regex_search(ln, rpathLinkRex));
+    }
+    QVERIFY(!appLinkCmd.contains("libstatic2.a"));
+    QVERIFY(!appLinkCmd.contains("libdynamic2.so"));
 }
 
 void TestApi::listBuildSystemFiles()
diff --git a/tests/auto/blackbox/testdata-qt/qml-debugging/qml-debugging.qbs b/tests/auto/blackbox/testdata-qt/qml-debugging/qml-debugging.qbs
index 8176a7c3e..0885e6b0b 100644
--- a/tests/auto/blackbox/testdata-qt/qml-debugging/qml-debugging.qbs
+++ b/tests/auto/blackbox/testdata-qt/qml-debugging/qml-debugging.qbs
@@ -4,4 +4,9 @@ QtApplication {
     Depends { name: "Qt.quick" }
     Qt.quick.qmlDebugging: true
     files: "main.cpp"
+    Probe {
+        id: checker
+        property bool isGcc: qbs.toolchain.contains("gcc")
+        configure: { console.info("is gcc: " + isGcc); }
+    }
 }
diff --git a/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs b/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs
index f48bf8d1f..b4fb0df4d 100644
--- a/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs
+++ b/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs
@@ -10,4 +10,9 @@ CppApplication {
         cpp.linkerFlags: ["-s"]
     }
     files: ["main.cpp"]
+    Probe {
+        id: checker
+        property bool isUnixGcc: qbs.toolchain.contains("gcc") && !qbs.targetOS.contains("macos")
+        configure: { console.info("is gcc: " + isUnixGcc); }
+    }
 }
diff --git a/tests/auto/blackbox/testdata/linker-library-duplicates/setup-run-environment.qbs b/tests/auto/blackbox/testdata/linker-library-duplicates/setup-run-environment.qbs
index e69cde064..c41e8f1d7 100644
--- a/tests/auto/blackbox/testdata/linker-library-duplicates/setup-run-environment.qbs
+++ b/tests/auto/blackbox/testdata/linker-library-duplicates/setup-run-environment.qbs
@@ -6,6 +6,11 @@ Project {
         files: ["lib1.cpp"]
         Depends { name: "bundle" }
         bundle.isBundle: false
+        Probe {
+            id: checker
+            property bool isGcc: qbs.toolchain.contains("gcc")
+            configure: { console.info("is gcc: " + isGcc); }
+        }
     }
 
     DynamicLibrary {
diff --git a/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs b/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs
index 0b4de0ab9..6d068b6a2 100644
--- a/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs
+++ b/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs
@@ -55,6 +55,13 @@ DynamicLibrary {
         }
     }
 
+    Probe {
+        id: checker
+        property bool isGcc: qbs.toolchain.contains("gcc")
+        property bool isLinux: qbs.targetOS.contains("linux")
+        configure: { console.info("is Linux gcc: " + (isGcc && isLinux)) }
+    }
+
     qbs.installPrefix: ""
     install: true
     installDir: ""
diff --git a/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs b/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs
index f7ed8e61a..fabdf48db 100644
--- a/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs
+++ b/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs
@@ -2,4 +2,9 @@ CppApplication {
     name: "the product"
     files: ["file1.cpp", "file2.cpp", "main.cpp"]
     cpp.cxxFlags: ["-flto"]
+    Probe {
+        id: checker
+        property bool isGcc: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
+        configure: { console.info("is gcc: " + isGcc); }
+    }
 }
diff --git a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
index 9f57b7f01..4198b863f 100644
--- a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
+++ b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
@@ -8,10 +8,13 @@ Project {
         Probe {
             id: osProbe
             property stringList targetOS: qbs.targetOS
+            property stringList toolchain: qbs.toolchain
             configure: {
                 console.info("is windows: " + (targetOS.includes("windows") ? "yes" : "no"));
                 console.info("is macos: " + (targetOS.includes("macos") ? "yes" : "no"));
                 console.info("is darwin: " + (targetOS.includes("darwin") ? "yes" : "no"));
+                console.info("is gcc: " + (toolchain.includes("gcc") ? "yes" : "no"));
+                console.info("is msvc: " + (toolchain.includes("msvc") ? "yes" : "no"));
             }
         }
     }
diff --git a/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs b/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs
index 6e2137173..35dd7a00f 100644
--- a/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs
+++ b/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs
@@ -20,4 +20,9 @@ Project {
         cpp.rpaths: qbs.installRoot + "/lib"
         cpp.systemRunPaths: project.setRunPaths ? [qbs.installRoot + "/lib"] : []
     }
+    Probe {
+        id: checker
+        property bool isUnix: qbs.targetOS.contains("unix")
+        configure: { console.info("is unix: " + isUnix); }
+    }
 }
diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs b/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs
index 534f49ff2..0e28e5687 100644
--- a/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs
+++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs
@@ -11,4 +11,9 @@ CppApplication {
         name: "file that needs help from the environment to find a header"
         files: "including.cpp"
     }
+    Probe {
+        id: checker
+        property bool isGcc: qbs.toolchain.contains("gcc")
+        configure: { console.info("is gcc: " + isGcc); }
+    }
 }
diff --git a/tests/auto/blackbox/testdata/versionscript/versionscript.qbs b/tests/auto/blackbox/testdata/versionscript/versionscript.qbs
index cc5c7b1cc..fcb4314a2 100644
--- a/tests/auto/blackbox/testdata/versionscript/versionscript.qbs
+++ b/tests/auto/blackbox/testdata/versionscript/versionscript.qbs
@@ -20,6 +20,12 @@ DynamicLibrary {
             return [cmd];
         }
     }
+    Probe {
+        id: checker
+        property bool isLinux: qbs.targetOS.includes("linux")
+        property bool isGcc: qbs.toolchain.contains("gcc")
+        configure: { console.info("is gcc for Linux: " + (isLinux && isGcc)); }
+    }
 
     qbs.installPrefix: ""
     install: true
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 93a676697..0648d399d 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -63,7 +63,6 @@
 #define WAIT_FOR_NEW_TIMESTAMP() waitForNewTimestamp(testDataDir)
 
 using qbs::Internal::HostOsInfo;
-using qbs::Profile;
 
 class MacosTarHealer {
 public:
@@ -139,7 +138,7 @@ QString TestBlackbox::findArchiver(const QString &fileName, int *status)
     QString binary = findExecutable(QStringList(fileName));
     if (binary.isEmpty()) {
         const SettingsPtr s = settings();
-        Profile p(profileName(), s.get());
+        qbs::Profile p(profileName(), s.get());
         binary = findExecutable(p.value("archiver.command").toStringList());
     }
     return binary;
@@ -1594,14 +1593,14 @@ void TestBlackbox::versionCheck_data()
 
 void TestBlackbox::versionScript()
 {
-    const SettingsPtr s = settings();
-    Profile buildProfile(profileName(), s.get());
-    QStringList toolchain = profileToolchain(buildProfile);
-    if (!toolchain.contains("gcc") || targetOs() != HostOsInfo::HostOsLinux)
-        QSKIP("version script test only applies to Linux");
     QDir::setCurrent(testDataDir + "/versionscript");
-    QCOMPARE(runQbs(QbsRunParameters(QStringList("-q")
-                                     << ("qbs.installRoot:" + QDir::currentPath()))), 0);
+    QCOMPARE(runQbs(QbsRunParameters("resolve", {"qbs.installRoot:" + QDir::currentPath()})), 0);
+    const bool isLinuxGcc = m_qbsStdout.contains("is gcc for Linux: true");
+    const bool isNotLinuxGcc = m_qbsStdout.contains("is gcc for Linux: false");
+    if (isNotLinuxGcc)
+        QSKIP("version script test only applies to Linux");
+    QVERIFY(isLinuxGcc);
+    QCOMPARE(runQbs(QbsRunParameters(QStringList("-q"))), 0);
     const QString output = QString::fromLocal8Bit(m_qbsStderr);
     const QRegularExpression pattern(QRegularExpression::anchoredPattern(".*---(.*)---.*"),
                                      QRegularExpression::DotMatchesEverythingOption);
@@ -2068,10 +2067,13 @@ void TestBlackbox::separateDebugInfo()
     const bool isDarwin = m_qbsStdout.contains("is darwin: yes");
     const bool isNotDarwin = m_qbsStdout.contains("is darwin: no");
     QVERIFY(isDarwin != isNotDarwin);
+    const bool isGcc = m_qbsStdout.contains("is gcc: yes");
+    const bool isNotGcc = m_qbsStdout.contains("is gcc: no");
+    QVERIFY(isGcc != isNotGcc);
+    const bool isMsvc = m_qbsStdout.contains("is msvc: yes");
+    const bool isNotMsvc = m_qbsStdout.contains("is msvc: no");
+    QVERIFY(isMsvc != isNotMsvc);
 
-    const SettingsPtr s = settings();
-    Profile buildProfile(profileName(), s.get());
-    QStringList toolchain = profileToolchain(buildProfile);
     if (isDarwin) {
         QVERIFY(directoryExists(relativeProductBuildDir("app1") + "/app1.app.dSYM"));
         QVERIFY(regularFileExists(relativeProductBuildDir("app1")
@@ -2151,7 +2153,7 @@ void TestBlackbox::separateDebugInfo()
             + "/bar4.bundle.dSYM/Contents/Resources/DWARF")
                 .entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries).size(), 1);
         QVERIFY(regularFileExists(relativeProductBuildDir("bar5") + "/bar5.bundle.dwarf"));
-    } else if (toolchain.contains("gcc")) {
+    } else if (isGcc) {
         const QString exeSuffix = isWindows ? ".exe" : "";
         const QString dllPrefix = isWindows ? "" : "lib";
         const QString dllSuffix = isWindows ? ".dll" : ".so";
@@ -2165,7 +2167,7 @@ void TestBlackbox::separateDebugInfo()
                               + '/' + dllPrefix +  "bar1" + dllSuffix + ".debug"));
         QVERIFY(!QFile::exists(relativeProductBuildDir("bar2")
                                + '/' + dllPrefix + "bar2" + dllSuffix + ".debug"));
-    } else if (toolchain.contains("msvc")) {
+    } else if (isMsvc) {
         QVERIFY(QFile::exists(relativeProductBuildDir("app1") + "/app1.pdb"));
         QVERIFY(QFile::exists(relativeProductBuildDir("foo1") + "/foo1.pdb"));
         QVERIFY(QFile::exists(relativeProductBuildDir("bar1") + "/bar1.pdb"));
@@ -2222,6 +2224,9 @@ void TestBlackbox::trackExternalProductChanges()
     QVERIFY(!m_qbsStdout.contains("compiling jsFileChange.cpp"));
     QVERIFY(!m_qbsStdout.contains("compiling fileExists.cpp"));
 
+    const bool isGcc = m_qbsStdout.contains("is gcc: true");
+    const bool isNotGcc = m_qbsStdout.contains("is gcc: false");
+
     QbsRunParameters params;
     params.environment.insert("QBS_TEST_PULL_IN_FILE_VIA_ENV", "1");
     QCOMPARE(runQbs(params), 0);
@@ -2271,12 +2276,11 @@ void TestBlackbox::trackExternalProductChanges()
     QVERIFY(!m_qbsStdout.contains("compiling jsFileChange.cpp"));
     QVERIFY(m_qbsStdout.contains("compiling fileExists.cpp"));
 
+    if (isNotGcc)
+        QSKIP("The remainder of this test requires a GCC-like toolchain");
+    QVERIFY(isGcc);
+
     rmDirR(relativeBuildDir());
-    const SettingsPtr s = settings();
-    const Profile profile(profileName(), s.get());
-    const QStringList toolchainTypes = profileToolchain(profile);
-    if (!toolchainTypes.contains("gcc"))
-        QSKIP("Need GCC-like compiler to run this test");
     params.environment = QbsRunParameters::defaultEnvironment();
     params.environment.insert("INCLUDE_PATH_TEST", "1");
     params.expectFailure = true;
@@ -2569,22 +2573,21 @@ void TestBlackbox::removeDuplicateLibraries()
 
 void TestBlackbox::reproducibleBuild()
 {
-    const SettingsPtr s = settings();
-    const Profile profile(profileName(), s.get());
-    const QStringList toolchains = profileToolchain(profile);
-    if (!toolchains.contains("gcc"))
-        QSKIP("reproducible builds only supported for gcc");
-    if (toolchains.contains("clang"))
-        QSKIP("reproducible builds are not supported for clang");
-
     QFETCH(bool, reproducible);
 
     QDir::setCurrent(testDataDir + "/reproducible-build");
-    QbsRunParameters params;
+    QbsRunParameters params("resolve");
     params.arguments << QString("modules.cpp.enableReproducibleBuilds:")
                         + (reproducible ? "true" : "false");
     rmDirR(relativeBuildDir());
     QCOMPARE(runQbs(params), 0);
+    const bool isGcc = m_qbsStdout.contains("is gcc: true");
+    const bool isNotGcc = m_qbsStdout.contains("is gcc: false");
+    if (isNotGcc)
+        QSKIP("reproducible builds only supported for gcc");
+    QVERIFY(isGcc);
+
+    QCOMPARE(runQbs(), 0);
     QFile object(relativeProductBuildDir("the product") + '/' + inputDirHash(".") + '/'
                  + objectFileName("file1.cpp", profileName()));
     QVERIFY2(object.open(QIODevice::ReadOnly), qPrintable(object.fileName()));
@@ -2592,6 +2595,7 @@ void TestBlackbox::reproducibleBuild()
     object.close();
     QCOMPARE(runQbs(QbsRunParameters("clean")), 0);
     QVERIFY(!object.exists());
+    params.command = "build";
     QCOMPARE(runQbs(params), 0);
     if (reproducible) {
         QVERIFY(object.open(QIODevice::ReadOnly));
@@ -3802,7 +3806,7 @@ void TestBlackbox::emptyProfile()
     QDir::setCurrent(testDataDir + "/empty-profile");
 
     const SettingsPtr s = settings();
-    const Profile buildProfile(profileName(), s.get());
+    const qbs::Profile buildProfile(profileName(), s.get());
     bool isMsvc = false;
     auto toolchainType = buildProfile.value(QStringLiteral("qbs.toolchainType")).toString();
     QbsRunParameters params;
@@ -3923,15 +3927,16 @@ void TestBlackbox::errorInfo()
 
 void TestBlackbox::escapedLinkerFlags()
 {
-    const SettingsPtr s = settings();
-    const Profile buildProfile(profileName(), s.get());
-    const QStringList toolchain = profileToolchain(buildProfile);
-    if (!toolchain.contains("gcc"))
-        QSKIP("escaped linker flags test only applies with gcc and GNU ld");
-    if (targetOs() == HostOsInfo::HostOsMacos)
-        QSKIP("Does not apply on macOS");
     QDir::setCurrent(testDataDir + "/escaped-linker-flags");
-    QbsRunParameters params(QStringList("products.app.escapeLinkerFlags:false"));
+    QbsRunParameters params("resolve", QStringList("products.app.escapeLinkerFlags:false"));
+    QCOMPARE(runQbs(params), 0);
+    const bool isGcc = m_qbsStdout.contains("is gcc: true");
+    const bool isNotGcc = m_qbsStdout.contains("is gcc: false");
+    if (isNotGcc)
+        QSKIP("escaped linker flags test only applies on plain unix with gcc and GNU ld");
+    QVERIFY(isGcc);
+
+    params.command = "build";
     QCOMPARE(runQbs(params), 0);
     params.command = "resolve";
     params.arguments = QStringList() << "products.app.escapeLinkerFlags:true";
@@ -3988,26 +3993,24 @@ void TestBlackbox::exportedPropertyInDisabledProduct_data()
 
 void TestBlackbox::systemRunPaths()
 {
-    const SettingsPtr s = settings();
-    const Profile buildProfile(profileName(), s.get());
-    switch (targetOs()) {
-    case HostOsInfo::HostOsLinux:
-    case HostOsInfo::HostOsMacos:
-    case HostOsInfo::HostOsOtherUnix:
-        break;
-    default:
-        QSKIP("only applies on Unix");
-    }
-
     const QString lddFilePath = findExecutable(QStringList() << "ldd");
     if (lddFilePath.isEmpty())
         QSKIP("ldd not found");
+
     QDir::setCurrent(testDataDir + "/system-run-paths");
     QFETCH(bool, setRunPaths);
     rmDirR(relativeBuildDir());
-    QbsRunParameters params;
+    QbsRunParameters params("resolve");
     params.arguments << QString("project.setRunPaths:") + (setRunPaths ? "true" : "false");
     QCOMPARE(runQbs(params), 0);
+    const bool isUnix = m_qbsStdout.contains("is unix: true");
+    const bool isNotUnix = m_qbsStdout.contains("is unix: false");
+    if (isNotUnix)
+        QSKIP("only applies on Unix");
+    QVERIFY(isUnix);
+
+    params.command = "build";
+    QCOMPARE(runQbs(params), 0);
     QProcess ldd;
     ldd.start(lddFilePath, QStringList() << relativeExecutableFilePath("app"));
     QVERIFY2(ldd.waitForStarted(), qPrintable(ldd.errorString()));
@@ -4565,7 +4568,7 @@ void TestBlackbox::cli()
     QCOMPARE(status, 0);
 
     const SettingsPtr s = settings();
-    Profile p("qbs_autotests-cli", s.get());
+    qbs::Profile p("qbs_autotests-cli", s.get());
     const QStringList toolchain = profileToolchain(p);
     if (!p.exists() || !(toolchain.contains("dotnet") || toolchain.contains("mono")))
         QSKIP("No suitable Common Language Infrastructure test profile");
@@ -5085,22 +5088,20 @@ void TestBlackbox::lexyaccOutputs_data()
 
 void TestBlackbox::linkerLibraryDuplicates()
 {
-    const SettingsPtr s = settings();
-    Profile buildProfile(profileName(), s.get());
-    QStringList toolchain = profileToolchain(buildProfile);
-    if (!toolchain.contains("gcc"))
-        QSKIP("linkerLibraryDuplicates test only applies to GCC toolchain");
-
     QDir::setCurrent(testDataDir + "/linker-library-duplicates");
     rmDirR(relativeBuildDir());
-
     QFETCH(QString, removeDuplicateLibraries);
     QStringList runParams;
-    if (!removeDuplicateLibraries.isEmpty()) {
+    if (!removeDuplicateLibraries.isEmpty())
         runParams.append(removeDuplicateLibraries);
-    }
 
     QCOMPARE(runQbs(QbsRunParameters("resolve", runParams)), 0);
+    const bool isGcc = m_qbsStdout.contains("is gcc: true");
+    const bool isNotGcc = m_qbsStdout.contains("is gcc: false");
+    if (isNotGcc)
+        QSKIP("linkerLibraryDuplicates test only applies to GCC toolchain");
+    QVERIFY(isGcc);
+
     QCOMPARE(runQbs(QStringList { "--command-echo-mode", "command-line" }), 0);
     const QByteArrayList output = m_qbsStdout.split('\n');
     QByteArray linkLine;
@@ -5165,20 +5166,20 @@ void TestBlackbox::linkerLibraryDuplicates_data()
 
 void TestBlackbox::linkerScripts()
 {
-    const SettingsPtr s = settings();
-    Profile buildProfile(profileName(), s.get());
-    QStringList toolchain = profileToolchain(buildProfile);
-    if (!toolchain.contains("gcc") || targetOs() != HostOsInfo::HostOsLinux)
-        QSKIP("linker script test only applies to Linux ");
-
-    QbsRunParameters runParams(QStringList()
-//                               << "--log-level" << "debug"
-                               << ("qbs.installRoot:" + QDir::currentPath()));
     const QString sourceDir = QDir::cleanPath(testDataDir + "/linkerscripts");
+    QbsRunParameters runParams("resolve", {"qbs.installRoot:" + QDir::currentPath()});
     runParams.buildDirectory = sourceDir + "/build";
     runParams.workingDir = sourceDir;
 
     QCOMPARE(runQbs(runParams), 0);
+    const bool isGcc = m_qbsStdout.contains("is Linux gcc: true");
+    const bool isNotGcc = m_qbsStdout.contains("is Linux gcc: false");
+    if (isNotGcc)
+        QSKIP("linker script test only applies to Linux");
+    QVERIFY(isGcc);
+
+    runParams.command = "build";
+    QCOMPARE(runQbs(runParams), 0);
     const QString output = QString::fromLocal8Bit(m_qbsStderr);
     const QRegularExpression pattern(QRegularExpression::anchoredPattern(".*---(.*)---.*"),
                                      QRegularExpression::DotMatchesEverythingOption);
@@ -7673,7 +7674,7 @@ void TestBlackbox::generator_data()
 void TestBlackbox::nodejs()
 {
     const SettingsPtr s = settings();
-    Profile p(profileName(), s.get());
+    qbs::Profile p(profileName(), s.get());
 
     int status;
     findNodejs(&status);
@@ -7714,7 +7715,7 @@ void TestBlackbox::typescript()
         QSKIP("Skip this test when running on GitHub");
 
     const SettingsPtr s = settings();
-    Profile p(profileName(), s.get());
+    qbs::Profile p(profileName(), s.get());
 
     int status;
     findTypeScript(&status);
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index ef08f8ee9..d0f0a3831 100644
--- a/tests/auto/blackbox/tst_blackboxqt.cpp
+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
@@ -38,7 +38,6 @@
 #define WAIT_FOR_NEW_TIMESTAMP() waitForNewTimestamp(testDataDir)
 
 using qbs::Internal::HostOsInfo;
-using qbs::Profile;
 
 TestBlackboxQt::TestBlackboxQt() : TestBlackboxBase (SRCDIR "/testdata-qt", "blackbox-qt")
 {
@@ -240,7 +239,7 @@ void TestBlackboxQt::mixedBuildVariants()
 {
     QDir::setCurrent(testDataDir + "/mixed-build-variants");
     const SettingsPtr s = settings();
-    Profile profile(profileName(), s.get());
+    qbs::Profile profile(profileName(), s.get());
     if (profileToolchain(profile).contains("msvc")) {
         QbsRunParameters params;
         params.arguments << "qbs.buildVariant:debug";
@@ -484,18 +483,22 @@ void TestBlackboxQt::qmlDebugging()
 {
     QDir::setCurrent(testDataDir + "/qml-debugging");
     QCOMPARE(runQbs(), 0);
-    const SettingsPtr s = settings();
-    Profile profile(profileName(), s.get());
-    if (!profileToolchain(profile).contains("gcc"))
-        return;
+
+    const bool isGcc = m_qbsStdout.contains("is gcc: true");
+    const bool isNotGcc = m_qbsStdout.contains("is gcc: false");
+    if (isNotGcc)
+        QSKIP("The remainder of this test only applies to gcc");
+    QVERIFY(isGcc);
+
     QProcess nm;
     nm.start("nm", QStringList(relativeExecutableFilePath("debuggable-app")));
-    if (nm.waitForStarted()) { // Let's ignore hosts without nm.
-        QVERIFY2(nm.waitForFinished(), qPrintable(nm.errorString()));
-        QVERIFY2(nm.exitCode() == 0, nm.readAllStandardError().constData());
-        const QByteArray output = nm.readAllStandardOutput();
-        QVERIFY2(output.toLower().contains("debugginghelper"), output.constData());
-    }
+    if (!nm.waitForStarted())
+        QSKIP("The remainder of this test requires nm");
+
+    QVERIFY2(nm.waitForFinished(), qPrintable(nm.errorString()));
+    QVERIFY2(nm.exitCode() == 0, nm.readAllStandardError().constData());
+    const QByteArray output = nm.readAllStandardOutput();
+    QVERIFY2(output.toLower().contains("debugginghelper"), output.constData());
 }
 
 void TestBlackboxQt::qobjectInObjectiveCpp()