diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-08-12 11:57:01 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-08-13 06:50:28 +0000 |
commit | 5f80f92e41a5a697ba816a9107baf65ba3264c31 (patch) | |
tree | 99e2ef55344605cc4004d288220d99046af94b56 /tests/auto/blackbox/testdata-baremetal | |
parent | 755e979d94eaa9fd521def369ebda5d271b335ca (diff) |
baremetal: Pass 'compiler-listing-files' test for KEIL ARM toolchain
KEIL ARM compiler generates a listing files with 'short' names.
For example, for the source 'main.c' file it will produce the
listing 'main.lst' file, instead of the 'main.c.lst' file.
Thus, we have to account for this behavior in our tests.
Change-Id: I69ef693cbdd0aacf838eaf382e13e09d7fadbfb1
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'tests/auto/blackbox/testdata-baremetal')
2 files changed, 8 insertions, 0 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 8ae4fc065..46faf9440 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 @@ -16,6 +16,10 @@ BareMetalApplication { || qbs.architecture === "c166") { return true; } + if (cpp.compilerName.startsWith("armcc")) { + console.info("using short listing file names"); + 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 741a21953..2596b441d 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 @@ -16,6 +16,10 @@ BareMetalApplication { || qbs.architecture === "c166") { return true; } + if (cpp.compilerName.startsWith("armcc")) { + console.info("using short listing file names"); + return true; + } } console.info("unsupported toolset: %%" + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%"); |