diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-04-07 20:11:29 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-04-08 12:18:26 +0000 |
commit | 4b5680cc16f5a190b98b7c0ed42bc43f8e9438b7 (patch) | |
tree | fa02844b43cd0a49203adf7a98660426e3a66bb1 /tests/auto/blackbox/tst_blackboxbaremetal.cpp | |
parent | d8cd1d151528da700ef0789c77e2f3dfdd5e17bb (diff) |
baremetal: Fix generation compiler listing using ARMCC compiler
The ARMCC compiler has no options for specifying the name of
the output listing file; it only has an options for specifying
an output directory.
In addition, the generated listing files are in truncated format,
e.g. instead of the 'module.{c|cpp}.lst' file will be generated
the 'module.lst' file.
This behavior complicates the writing of unit tests, and also
complicates the implementation if the user wants to change the
cpp.compilerListingSuffix property.
A workaround is to post-process the compiler listing files after
they are generated. In this case, we only need to rename the
generated compiler listing file to the desired one.
Change-Id: I89c81896711b90b146a94c35d2ec75e296824752
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxbaremetal.cpp')
-rw-r--r-- | tests/auto/blackbox/tst_blackboxbaremetal.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/auto/blackbox/tst_blackboxbaremetal.cpp b/tests/auto/blackbox/tst_blackboxbaremetal.cpp index b027a4e70..467c95122 100644 --- a/tests/auto/blackbox/tst_blackboxbaremetal.cpp +++ b/tests/auto/blackbox/tst_blackboxbaremetal.cpp @@ -210,18 +210,14 @@ void TestBlackboxBareMetal::compilerListingFiles() if (!extractQuitedValue(m_qbsStdout, compilerListingSuffix)) QFAIL("Unable to extract current compiler listing suffix"); - const bool isShortListingNames = m_qbsStdout.contains("using short listing file names"); - QCOMPARE(runQbs(QbsRunParameters(args)), 0); const QString productBuildDir = relativeProductBuildDir("compiler-listing"); const QString hash = inputDirHash("."); const QString mainListing = productBuildDir + "/" + hash - + (isShortListingNames ? "/main" : "/main.c") - + compilerListingSuffix; + + "/main.c" + compilerListingSuffix; QCOMPARE(regularFileExists(mainListing), generateListing); const QString funListing = productBuildDir + "/" + hash - + (isShortListingNames ? "/fun" : "/fun.c") - + compilerListingSuffix; + + "/fun.c" + compilerListingSuffix; QCOMPARE(regularFileExists(funListing), generateListing); } |