baremetal: Improve 'compiler-listing' test

We do not need multiple test data instances (*.qbs) for each property,
because we can pass the required properties from the C++ code directly.

Also now we can know about the compiler listing file suffix directly,
through the cpp.compilerListingSuffix property.

Change-Id: I644277458e3ae460cbfb6bba4a24583d9e6ba3e1
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

6 files changed, 1 insertions, 27 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/compiler-listing/compiler-listing.qbs
index 1bc4ba208..0adfbe37b 100644
--- a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/compiler-listing/compiler-listing.qbs
@@ -5,12 +5,12 @@ BareMetalApplication {
         if (!qbs.toolchain.contains("gcc")) {
             if (cpp.compilerName.startsWith("armcc"))
                 console.info("using short listing file names");
+            console.info("compiler listing suffix: %%" + cpp.compilerListingSuffix + "%%");
             return true;
         }
         console.info("unsupported toolset: %%"
             + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%");
         return false;
     }
-    cpp.generateCompilerListingFiles: false
     files: ["main.c", "fun.c"]
 }
diff --git a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/fun.c b/tests/auto/blackbox/testdata-baremetal/compiler-listing/fun.c
index 3b8c8f2f4..3b8c8f2f4 100644
--- a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/fun.c
+++ b/tests/auto/blackbox/testdata-baremetal/compiler-listing/fun.c
diff --git a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/main.c b/tests/auto/blackbox/testdata-baremetal/compiler-listing/main.c
index 2c3d7726c..2c3d7726c 100644
--- a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/main.c
+++ b/tests/auto/blackbox/testdata-baremetal/compiler-listing/main.c
diff --git a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/fun.c b/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/fun.c
deleted file mode 100644
index 3b8c8f2f4..000000000
--- a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/fun.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int f(void)
-{
-    return 0;
-}
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
deleted file mode 100644
index a6731d224..000000000
--- a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs
+++ /dev/null
@@ -1,16 +0,0 @@
-import "../BareMetalApplication.qbs" as BareMetalApplication
-
-BareMetalApplication {
-    condition: {
-        if (!qbs.toolchain.contains("gcc")) {
-            if (cpp.compilerName.startsWith("armcc"))
-                console.info("using short listing file names");
-            return true;
-        }
-        console.info("unsupported toolset: %%"
-            + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%");
-        return false;
-    }
-    cpp.generateCompilerListingFiles: true
-    files: ["main.c", "fun.c"]
-}
diff --git a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/main.c b/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/main.c
deleted file mode 100644
index 2c3d7726c..000000000
--- a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/main.c
+++ /dev/null
@@ -1,6 +0,0 @@
-extern int f(void);
-
-int main(void)
-{
-    return f();
-}