improve runner, try to fix CI

Author: robamu

.cargo/config.toml

@@ -5,8 +5,15 @@
 
 [target.thumbv7em-none-eabihf]
 # used to run the qemu_test.rs example with QEMU
-runner = "./qemu-runner.sh"
+runner = "./qemu-runner.sh --target thumbv7em-none-eabihf"
+rustflags = [
+  "-Clink-arg=-Tlink.x",
+  "-Clink-arg=-Tdefmt.x",
+]
 
+[target.thumbv6m-none-eabi]
+# used to run the qemu_test.rs example with QEMU
+runner = "./qemu-runner.sh --target thumbv6m-none-eabi"
 rustflags = [
   "-Clink-arg=-Tlink.x",
   "-Clink-arg=-Tdefmt.x",

.github/workflows/ci.yml

@@ -56,8 +56,8 @@ jobs:
           sudo apt update
           sudo apt install qemu-system-arm
       - run: qemu-system-arm --version
-      - run: cargo run --target thumbv7m-none-eabi --example llff_integration_test --all-features
-      - run: cargo run --target thumbv7m-none-eabi --example tlsf_integration_test --all-features
+      - run: cargo +nightly run --target thumbv7m-none-eabi --example llff_integration_test --all-features
+      - run: cargo +nightly run --target thumbv7m-none-eabi --example tlsf_integration_test --all-features
 
   clippy:
     name: Clippy

Cargo.toml

@@ -41,12 +41,19 @@ const-default = { version = "1.0.0", default-features = false, optional = true }
 [dev-dependencies]
 cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
 cortex-m-rt = "0.7"
-# cortex-m-semihosting = "0.5"
 defmt = "1.0"
 defmt-semihosting = "0.3.0"
 semihosting = { version = "0.1.20", features = ["stdio"] }
 static_cell = "2"
 
+# thumbv6m-none-eabi only
+[target.thumbv6m-none-eabi.dev-dependencies]
+portable-atomic = { version = "1", features = ["unsafe-assume-single-core"] }
+
+# every other target gets the crate without the feature
+[target.'cfg(not(target = "thumbv6m-none-eabi"))'.dev-dependencies]
+portable-atomic = { version = "1" }
+
 [[example]]
 name = "allocator_api"
 required-features = ["allocator_api", "llff"]

qemu-runner.sh

@@ -3,12 +3,33 @@
 # This requires you to previously run `cargo install defmt-print`
 
 # See https://ferroussystems.hackmd.io/@jonathanpallant/ryA1S6QDJx for a description of all the relevant QEMU machines
-ELF_BINARY="$1"
+TARGET=""
+ELF_BINARY=""
+
+# very small argument parser
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --target)   TARGET="$2"; shift 2 ;;
+        *)          ELF_BINARY="$1"; shift ;;
+    esac
+done
+
+# default to the target cargo is currently building for
+TARGET="${TARGET:-thumbv7em-none-eabihf}"
+
+case "$TARGET" in
+    thumbv6m-none-eabi)
+        MACHINE="-cpu cortex-m3 -machine mps2-an385" ;;
+    thumbv7em-none-eabihf)
+        # All suitable for thumbv7em-none-eabihf
+        MACHINE="-cpu cortex-m4 -machine mps2-an386" ;;
+        # MACHINE="-cpu cortex-m7 -machine mps2-387" ;;
+        # MACHINE="-cpu cortex-m7 -machine mps2-500"
+    *)
+        echo "Unsupported target: $TARGET" >&2
+        exit 1 ;;
+esac
 
-# All suitable for thumbv7em-none-eabihf
-MACHINE="-cpu cortex-m4 -machine mps2-an386"
-# MACHINE="-cpu cortex-m7 -machine mps2-387"
-# MACHINE="-cpu cortex-m7 -machine mps2-500"
 LOG_FORMAT='{[{L}]%bold} {s} {({ff}:{l:1})%dimmed}'
 
 echo "Running on '$MACHINE'..."