diff options
Diffstat (limited to 'tests')
2 files changed, 6 insertions, 34 deletions
diff --git a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs b/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs index 46faf9440..1bc4ba208 100644 --- a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs +++ b/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs @@ -2,24 +2,10 @@ import "../BareMetalApplication.qbs" as BareMetalApplication BareMetalApplication { condition: { - if (qbs.toolchainType === "sdcc") - return true; - if (qbs.toolchainType === "msvc") - return true; - if (qbs.toolchainType === "clang-cl") - return true; - if (qbs.toolchainType === "iar") - return true; - if (qbs.toolchainType === "keil") { - if (qbs.architecture === "mcs51" - || qbs.architecture === "mcs251" - || qbs.architecture === "c166") { - return true; - } - if (cpp.compilerName.startsWith("armcc")) { + if (!qbs.toolchain.contains("gcc")) { + if (cpp.compilerName.startsWith("armcc")) console.info("using short listing file names"); - return true; - } + return true; } console.info("unsupported toolset: %%" + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%"); diff --git a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs b/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs index 2596b441d..a6731d224 100644 --- a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs +++ b/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs @@ -2,24 +2,10 @@ import "../BareMetalApplication.qbs" as BareMetalApplication BareMetalApplication { condition: { - if (qbs.toolchainType === "sdcc") - return true; - if (qbs.toolchainType === "msvc") - return true; - if (qbs.toolchainType === "clang-cl") - return true; - if (qbs.toolchainType === "iar") - return true; - if (qbs.toolchainType === "keil") { - if (qbs.architecture === "mcs51" - || qbs.architecture === "mcs251" - || qbs.architecture === "c166") { - return true; - } - if (cpp.compilerName.startsWith("armcc")) { + if (!qbs.toolchain.contains("gcc")) { + if (cpp.compilerName.startsWith("armcc")) console.info("using short listing file names"); - return true; - } + return true; } console.info("unsupported toolset: %%" + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%"); |