update stm32 project, validate json output

Author: t-moe

.github/test-projects/step-executor.sh

@@ -1,7 +1,39 @@
-#!/bin/sh
-set -e
+#!/bin/bash
 set -x
 
-/home/probe-rs-runner/probe-rs run "$TARGET" $TARGET_CONFIG
+touch stdout
+touch stderr
 
+/home/probe-rs-runner/probe-rs run --disable-progressbars "$TARGET" $TARGET_CONFIG  --format=json  2> stderr | jq -c 'del(.exec_time)' >stdout
+
+echo "Stdout" >&2
+echo "------------------------------------------------" >&2
+cat stdout >&2
+echo "Stderr" >&2
+echo "------------------------------------------------" >&2
+cat stderr >&2
+
+res=0
+
+# Output markers around diff to render it nicely in markdown
+echo "Test Results diff:"
+echo "\`\`\`diff"
+if ! diff stdout expected_test_results.txt; then
+  res=1
+fi
+
+echo "\`\`\`"
+
+echo "Stderr diff:"
+echo "\`\`\`diff"
+#if !diff stderr expected_stderr.txt; then
+#  res=1
+#fi
+cat stderr
+echo "\`\`\`"
+
+rm -f stdout
+rm -f stderr
+
+#exit $res
 exit 1

.github/test-projects/stm32/Cargo.lock

@@ -10,12 +10,13 @@ cortex-m = { version = "0.7.7", features = ["inline-asm", "critical-section-sing
 cortex-m-rt = "0.7.3"
 panic-probe = "0.3"
 rtt-target = { version = "0.6.1", features = ["log"] }
-
-embassy-stm32 = { git = "https://github.com/embassy-rs/embassy", rev = "ed3da1721a4f704d3f2a8a1cf84d9fc051c71945", features = ["time-driver-any", "memory-x", "unstable-pac", "exti"] }
+embassy-executor = { version = "0.6.3", features = ["arch-cortex-m", "executor-thread", "integrated-timers"] }
+embassy-stm32 = { version = "0.1.0", features = ["time-driver-any", "memory-x", "unstable-pac", "exti"] }
+embassy-time = "0.3.2"
 log = "0.4.22"
 
 [dev-dependencies]
-embedded-test = { version = "0.5.0" }
+embedded-test = { path = "../../..", features = ["embassy", "log"] }
 
 [[test]]
 name = "example_test"

.github/test-projects/stm32/Cargo.toml

@@ -9,9 +9,10 @@ set -x
 set -e
 
 # to show a possible error in the output
-cargo test --target "$2" --features embassy-stm32/"$1" --release --test example_test --no-run
+cargo test --locked --target "$2" --features embassy-stm32/"$1" --release --test example_test --no-run
 
 # Copy artifact to output directory
-exec=$(cargo test --target "$2" --features embassy-stm32/"$1" --release --test example_test --no-run --message-format=json | jq -r 'select(.executable and .target.kind==["test"])|.executable')
+exec=$(cargo test --locked --target "$2" --features embassy-stm32/"$1" --release --test example_test --no-run --message-format=json | jq -r 'select(.executable and .target.kind==["test"])|.executable')
 mkdir -p output
-cp "$exec" output/"$1"
+cp "$exec" output/"$1"
+cp expected_test_results.txt output/