1 files changed, 47 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
index e98279d6c..f556fc093 100644
--- a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
@@ -3,15 +3,61 @@ import "../BareMetalApplication.qbs" as BareMetalApplication
 BareMetalApplication {
     condition: {
         if (qbs.toolchainType === "keil") {
+            if (qbs.architecture.startsWith("arm"))
+                return true;
             if (qbs.architecture === "mcs51")
                 return true;
+            if (qbs.architecture === "mcs251")
+                return true;
+            if (qbs.architecture === "c166")
+                return true;
         } else if (qbs.toolchainType === "iar") {
+            if (qbs.architecture.startsWith("arm"))
+                return true;
+            if (qbs.architecture === "mcs51")
+                return true;
+            if (qbs.architecture === "stm8")
+                return true;
+            if (qbs.architecture === "avr")
+                return true;
+            if (qbs.architecture === "msp430")
+                return true;
+        } else if (qbs.toolchainType === "sdcc") {
             if (qbs.architecture === "mcs51")
                 return true;
+            if (qbs.architecture === "stm8")
+                return true;
+        } else if (qbs.toolchainType === "gcc") {
+            if (qbs.architecture.startsWith("arm"))
+                return true;
+            if (qbs.architecture === "avr")
+                return true;
+            if (qbs.architecture === "msp430")
+                return true;
+            if (qbs.architecture === "xtensa")
+                return true;
         }
         console.info("unsupported toolset: %%"
             + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%");
         return false;
     }
-    files: [qbs.architecture + "-" + qbs.toolchainType + ".s"]
+
+    Properties {
+        condition: qbs.toolchainType === "gcc"
+            && qbs.architecture === "msp430"
+        // We need to use this workaround to enable
+        // the cpp.driverFlags property.
+        cpp.linkerPath: cpp.compilerPathByLanguage["c"]
+    }
+
+    Properties {
+        condition: qbs.toolchainType === "iar"
+            && qbs.architecture.startsWith("arm")
+        cpp.entryPoint: "main"
+    }
+
+    cpp.linkerPath: original
+
+    files: [(qbs.architecture.startsWith("arm") ? "arm" : qbs.architecture)
+                + "-" + qbs.toolchainType + ".s"]
 }