baremetal: Derive test application and library from base product

It makes sense to store platform-specific flags in one place, for
example, in BareMetalProduct. And then to inherit the applications
and the libraries from this common product. This solution minimizes
the copy/paste errors and make a tests code easier to maintain.

Change-Id: Iaf11be9d6f983e8ce542787d42e8b7ef050b1903
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 131 insertions, 228 deletions

diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
index 86874466b..a52bb4c4e 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
@@ -1,126 +1,3 @@
-CppApplication {
-    cpp.positionIndependentCode: false
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "stm8"
-        cpp.driverLinkerFlags: [
-            "--config_def", "_CSTACK_SIZE=0x100",
-            "--config_def", "_HEAP_SIZE=0x100",
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "rl78"
-        cpp.driverLinkerFlags: [
-            "--config_def", "_NEAR_HEAP_SIZE=256",
-            "--config_def", "_FAR_HEAP_SIZE=4096",
-            "--config_def", "_HUGE_HEAP_SIZE=0",
-            "--config_def", "_STACK_SIZE=128",
-            "--config_def", "_NEAR_CONST_LOCATION_SIZE=0x6F00",
-            "--config_def", "_NEAR_CONST_LOCATION_START=0x3000",
-            "--define_symbol", "_NEAR_CONST_LOCATION=0",
-            "--config", cpp.toolchainInstallPath + "/../config/lnkrl78_s3.icf"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "rh850"
-        cpp.driverLinkerFlags: [
-            "--config_def", "CSTACK_SIZE=0x1000",
-            "--config_def", "HEAP_SIZE=0x1000",
-            "--config", cpp.toolchainInstallPath + "/../config/lnkrh850_g3m.icf"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "v850"
-        cpp.driverLinkerFlags: [
-            "-D_CSTACK_SIZE=1000",
-            "-D_HEAP_SIZE=1000",
-            "-f", cpp.toolchainInstallPath + "/../config/lnk85.xcl"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "78k"
-        cpp.cFlags: [
-            "--core", "78k0",
-            "--code_model", "standard"
-        ]
-        cpp.driverLinkerFlags: [
-            "-D_CSTACK_SIZE=80",
-            "-D_HEAP_SIZE=200",
-            "-D_CODEBANK_START=0",
-            "-D_CODEBANK_END=0",
-            "-D_CODEBANK_BANKS=0",
-            "-f", cpp.toolchainInstallPath + "/../config/lnk.xcl",
-            cpp.toolchainInstallPath + "/../lib/clib/cl78ks1.r26"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "sh"
-        cpp.driverLinkerFlags: [
-            "--config_def", "_CSTACK_SIZE=0x800",
-            "--config_def", "_HEAP_SIZE=0x800",
-            "--config_def", "_INT_TABLE=0x10",
-            "--config", cpp.toolchainInstallPath + "/../config/generic.icf"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "hcs8"
-        cpp.driverLinkerFlags: [
-            "-D_CSTACK_SIZE=200",
-            "-D_HEAP_SIZE=200",
-            "-f", cpp.toolchainInstallPath + "/../config/lnkunspecifieds08.xcl"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "m32c"
-        cpp.driverLinkerFlags: [
-            "-D_CSTACK_SIZE=100",
-            "-D_NEAR_HEAP_SIZE=400",
-            "-D_FAR_HEAP_SIZE=400",
-            "-D_HUGE_HEAP_SIZE=400",
-            "-D_ISTACK_SIZE=40",
-            "-f", cpp.toolchainInstallPath + "/../config/lnkm32c.xcl",
-            cpp.toolchainInstallPath + (qbs.debugInformation ? "/../lib/dlib/dlm32cnf.r48" : "/../lib/clib/clm32cf.r48")
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("keil")
-            && qbs.architecture.startsWith("arm")
-            && cpp.compilerName.startsWith("armcc")
-        cpp.assemblerFlags: ["--cpu", "cortex-m0"]
-        cpp.driverFlags: ["--cpu", "cortex-m0"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("keil")
-            && qbs.architecture.startsWith("arm")
-            && cpp.compilerName.startsWith("armclang")
-        cpp.assemblerFlags: ["--cpu", "cortex-m0"]
-        cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture.startsWith("arm")
-        cpp.driverFlags: ["-specs=nosys.specs"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture === "xtensa"
-        cpp.driverFlags: ["-nostdlib"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture === "msp430"
-        cpp.driverFlags: ["-mmcu=msp430f5529"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture === "m32r"
-        cpp.driverFlags: ["-nostdlib"]
-    }
+BareMetalProduct {
+    type: "application"
 }
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
new file mode 100644
index 000000000..e97b37ee9
--- /dev/null
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
@@ -0,0 +1,127 @@
+Product {
+    Depends { name: "cpp" }
+    cpp.positionIndependentCode: false
+    Properties {
+        condition: qbs.toolchain.contains("iar")
+            && qbs.architecture === "stm8"
+        cpp.driverLinkerFlags: [
+            "--config_def", "_CSTACK_SIZE=0x100",
+            "--config_def", "_HEAP_SIZE=0x100",
+        ]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("iar")
+            && qbs.architecture === "rl78"
+        cpp.driverLinkerFlags: [
+            "--config_def", "_NEAR_HEAP_SIZE=256",
+            "--config_def", "_FAR_HEAP_SIZE=4096",
+            "--config_def", "_HUGE_HEAP_SIZE=0",
+            "--config_def", "_STACK_SIZE=128",
+            "--config_def", "_NEAR_CONST_LOCATION_SIZE=0x6F00",
+            "--config_def", "_NEAR_CONST_LOCATION_START=0x3000",
+            "--define_symbol", "_NEAR_CONST_LOCATION=0",
+            "--config", cpp.toolchainInstallPath + "/../config/lnkrl78_s3.icf"
+        ]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("iar")
+            && qbs.architecture === "rh850"
+        cpp.driverLinkerFlags: [
+            "--config_def", "CSTACK_SIZE=0x1000",
+            "--config_def", "HEAP_SIZE=0x1000",
+            "--config", cpp.toolchainInstallPath + "/../config/lnkrh850_g3m.icf"
+        ]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("iar")
+            && qbs.architecture === "v850"
+        cpp.driverLinkerFlags: [
+            "-D_CSTACK_SIZE=1000",
+            "-D_HEAP_SIZE=1000",
+            "-f", cpp.toolchainInstallPath + "/../config/lnk85.xcl"
+        ]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("iar")
+            && qbs.architecture === "78k"
+        cpp.cFlags: [
+            "--core", "78k0",
+            "--code_model", "standard"
+        ]
+        cpp.driverLinkerFlags: [
+            "-D_CSTACK_SIZE=80",
+            "-D_HEAP_SIZE=200",
+            "-D_CODEBANK_START=0",
+            "-D_CODEBANK_END=0",
+            "-D_CODEBANK_BANKS=0",
+            "-f", cpp.toolchainInstallPath + "/../config/lnk.xcl",
+            cpp.toolchainInstallPath + "/../lib/clib/cl78ks1.r26"
+        ]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("iar")
+            && qbs.architecture === "sh"
+        cpp.driverLinkerFlags: [
+            "--config_def", "_CSTACK_SIZE=0x800",
+            "--config_def", "_HEAP_SIZE=0x800",
+            "--config_def", "_INT_TABLE=0x10",
+            "--config", cpp.toolchainInstallPath + "/../config/generic.icf"
+        ]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("iar")
+            && qbs.architecture === "hcs8"
+        cpp.driverLinkerFlags: [
+            "-D_CSTACK_SIZE=200",
+            "-D_HEAP_SIZE=200",
+            "-f", cpp.toolchainInstallPath + "/../config/lnkunspecifieds08.xcl"
+        ]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("iar")
+            && qbs.architecture === "m32c"
+        cpp.driverLinkerFlags: [
+            "-D_CSTACK_SIZE=100",
+            "-D_NEAR_HEAP_SIZE=400",
+            "-D_FAR_HEAP_SIZE=400",
+            "-D_HUGE_HEAP_SIZE=400",
+            "-D_ISTACK_SIZE=40",
+            "-f", cpp.toolchainInstallPath + "/../config/lnkm32c.xcl",
+            cpp.toolchainInstallPath + (qbs.debugInformation ? "/../lib/dlib/dlm32cnf.r48" : "/../lib/clib/clm32cf.r48")
+        ]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("keil")
+            && qbs.architecture.startsWith("arm")
+            && cpp.compilerName.startsWith("armcc")
+        cpp.assemblerFlags: ["--cpu", "cortex-m0"]
+        cpp.driverFlags: ["--cpu", "cortex-m0"]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("keil")
+            && qbs.architecture.startsWith("arm")
+            && cpp.compilerName.startsWith("armclang")
+        cpp.assemblerFlags: ["--cpu", "cortex-m0"]
+        cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("gcc")
+            && qbs.architecture.startsWith("arm")
+        cpp.driverFlags: ["-specs=nosys.specs"]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("gcc")
+            && qbs.architecture === "xtensa"
+        cpp.driverFlags: ["-nostdlib"]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("gcc")
+            && qbs.architecture === "msp430"
+        cpp.driverFlags: ["-mmcu=msp430f5529"]
+    }
+    Properties {
+        condition: qbs.toolchain.contains("gcc")
+            && qbs.architecture === "m32r"
+        cpp.driverFlags: ["-nostdlib"]
+    }
+}
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
index 560455162..7259b1446 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
@@ -1,104 +1,3 @@
-StaticLibrary {
-    cpp.positionIndependentCode: false
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "stm8"
-        cpp.driverLinkerFlags: [
-            "--config_def", "_CSTACK_SIZE=0x100",
-            "--config_def", "_HEAP_SIZE=0x100",
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "rl78"
-        cpp.driverLinkerFlags: [
-            "--config_def", "_NEAR_HEAP_SIZE=256",
-            "--config_def", "_FAR_HEAP_SIZE=4096",
-            "--config_def", "_HUGE_HEAP_SIZE=0",
-            "--config_def", "_STACK_SIZE=128",
-            "--config_def", "_NEAR_CONST_LOCATION_SIZE=0x6F00",
-            "--config_def", "_NEAR_CONST_LOCATION_START=0x3000",
-            "--define_symbol", "_NEAR_CONST_LOCATION=0",
-            "--config", cpp.toolchainInstallPath + "/../config/lnkrl78_s3.icf"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "rh850"
-        cpp.driverLinkerFlags: [
-            "--config_def", "CSTACK_SIZE=0x1000",
-            "--config_def", "HEAP_SIZE=0x1000",
-            "--config", cpp.toolchainInstallPath + "/../config/lnkrh850_g3m.icf"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "v850"
-        cpp.driverLinkerFlags: [
-            "-D_CSTACK_SIZE=1000",
-            "-D_HEAP_SIZE=1000",
-            "-f", cpp.toolchainInstallPath + "/../config/lnk85.xcl"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "78k"
-        cpp.cFlags: [
-            "--core", "78k0",
-            "--code_model", "standard"
-        ]
-        cpp.driverLinkerFlags: [
-            "-D_CSTACK_SIZE=80",
-            "-D_HEAP_SIZE=200",
-            "-D_CODEBANK_START=0",
-            "-D_CODEBANK_END=0",
-            "-D_CODEBANK_BANKS=0",
-            "-f", cpp.toolchainInstallPath + "/../config/lnk.xcl",
-            cpp.toolchainInstallPath + "/../lib/clib/cl78ks1.r26"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("iar")
-            && qbs.architecture === "sh"
-        cpp.driverLinkerFlags: [
-            "--config_def", "_CSTACK_SIZE=0x800",
-            "--config_def", "_HEAP_SIZE=0x800",
-            "--config_def", "_INT_TABLE=0x10",
-            "--config", cpp.toolchainInstallPath + "/../config/generic.icf"
-        ]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("keil")
-            && qbs.architecture.startsWith("arm")
-            && cpp.compilerName.startsWith("armcc")
-        cpp.assemblerFlags: ["--cpu", "cortex-m0"]
-        cpp.driverFlags: ["--cpu", "cortex-m0"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("keil")
-            && qbs.architecture.startsWith("arm")
-            && cpp.compilerName.startsWith("armclang")
-        cpp.assemblerFlags: ["--cpu", "cortex-m0"]
-        cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture.startsWith("arm")
-        cpp.driverFlags: ["-specs=nosys.specs"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture === "xtensa"
-        cpp.driverFlags: ["-nostdlib"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture === "msp430"
-        cpp.driverFlags: ["-mmcu=msp430f5529"]
-    }
-    Properties {
-        condition: qbs.toolchain.contains("gcc")
-            && qbs.architecture === "m32r"
-        cpp.driverFlags: ["-nostdlib"]
-    }
+BareMetalProduct {
+    type: "staticlibrary"
 }