aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-07-23 15:40:48 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-07-23 17:27:50 +0000
commitde4cf2c1f78e7a90a80464ebb46558e0fdd85259 (patch)
treeacde6b84870f1987661476cd358b0b58af659e88
parent4bd119f1063a2e73085b47772f1e6838ecf172ed (diff)
baremetal: Pass 'one-object-asm-application' test for IAR STM8
... also the changes in the BareMetal{Application|StaticLibrary}.qbs files allows to pass all other IAR STM8 tests. Change-Id: Ic4e36e0e1a19863d2c9172a17e4bcfc5da7e3a34 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs8
-rw-r--r--tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs8
-rw-r--r--tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs2
-rw-r--r--tests/auto/blackbox/testdata-baremetal/one-object-asm-application/stm8-iar.s7
4 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
index d802937d1..1183c9036 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
@@ -1,5 +1,13 @@
CppApplication {
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("keil")
&& qbs.architecture.startsWith("arm")
&& cpp.compilerName.startsWith("armcc")
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
index 01493a5ec..6f985c84b 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
@@ -1,5 +1,13 @@
StaticLibrary {
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("keil")
&& qbs.architecture.startsWith("arm")
&& cpp.compilerName.startsWith("armcc")
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 0bf07b0d7..1aece3b13 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
@@ -12,6 +12,8 @@ BareMetalApplication {
return true;
if (qbs.architecture === "mcs51")
return true;
+ if (qbs.architecture === "stm8")
+ return true;
} else if (qbs.toolchainType === "sdcc") {
if (qbs.architecture === "mcs51")
return true;
diff --git a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/stm8-iar.s b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/stm8-iar.s
new file mode 100644
index 000000000..674e20de6
--- /dev/null
+++ b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/stm8-iar.s
@@ -0,0 +1,7 @@
+ PUBLIC main
+ SECTION `.near_func.text`:CODE:REORDER:NOROOT(0)
+ CODE
+main:
+ CLRW X
+ RET
+ END