aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-09-22 18:33:59 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-09-23 19:00:07 +0000
commit12d227409e1143b55bc1e49bfaef402fb641cd56 (patch)
treec8127cfa9317ba37f23d16b7c30e0dd11e7ffdde /tests
parent36b345c8cdd6a3c471a871ef184936b56674e696 (diff)
baremetal: Implement cpp.generateCompilerListingFiles for ARMCLANG
The ARMCLANG compiler does not support generating of the listing files. Instead, it is recommended to use the disassembler: * https://www.keil.com/support/docs/4152.htm Take a note that the disassembler does not work with the evaluation license! Change-Id: If8b45e40523015d27e4439cf00028815211338ed Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs20
-rw-r--r--tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs20
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 + "%%");