diff options
| -rw-r--r-- | tests/auto/blackbox/testdata-baremetal/preinclude-headers/preinclude-headers.qbs | 10 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxbaremetal.cpp | 11 |
2 files changed, 20 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata-baremetal/preinclude-headers/preinclude-headers.qbs b/tests/auto/blackbox/testdata-baremetal/preinclude-headers/preinclude-headers.qbs index 8ea1c3652..088af3340 100644 --- a/tests/auto/blackbox/testdata-baremetal/preinclude-headers/preinclude-headers.qbs +++ b/tests/auto/blackbox/testdata-baremetal/preinclude-headers/preinclude-headers.qbs @@ -1,6 +1,16 @@ import "../BareMetalApplication.qbs" as BareMetalApplication BareMetalApplication { + condition: { + if (qbs.toolchainType === "keil") { + if (qbs.architecture === "mcs51") { + console.info("unsupported toolset: %%" + + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%"); + return false; + } + } + return true; + } cpp.prefixHeaders: ["preinclude.h"] files: ["main.c"] } diff --git a/tests/auto/blackbox/tst_blackboxbaremetal.cpp b/tests/auto/blackbox/tst_blackboxbaremetal.cpp index a80a1ad8f..2f6169ff9 100644 --- a/tests/auto/blackbox/tst_blackboxbaremetal.cpp +++ b/tests/auto/blackbox/tst_blackboxbaremetal.cpp @@ -110,7 +110,16 @@ void TestBlackboxBareMetal::distributionIncludePaths() void TestBlackboxBareMetal::preincludeHeaders() { QDir::setCurrent(testDataDir + "/preinclude-headers"); - QCOMPARE(runQbs(), 0); + QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList("-n"))), 0); + if (!m_qbsStdout.contains("unsupported toolset:")) { + QCOMPARE(runQbs(), 0); + } else { + QByteArray toolchain; + QByteArray architecture; + extractUnsupportedToolset(m_qbsStdout, toolchain, architecture); + QSKIP("Unsupported toolchain '" + toolchain + + "' for architecture '" + architecture + "'"); + } } QTEST_MAIN(TestBlackboxBareMetal) |