Skip to content

Commit cca953c

Browse files
committed
update stm32 project, validate json output
1 parent 430e5e5 commit cca953c

9 files changed

+225
-73
lines changed
+38-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,41 @@
1-
#!/bin/sh
2-
set -e
3-
set -x
1+
#!/bin/bash
42

5-
/home/probe-rs-runner/probe-rs run "$TARGET" $TARGET_CONFIG
3+
touch stdout
4+
touch stderr
65

6+
/home/probe-rs-runner/probe-rs run --disable-progressbars "$TARGET" $TARGET_CONFIG --format=json 2> stderr | jq -c 'del(.exec_time)' >stdout
7+
8+
# Remove all timestamps, and lines starting with /home/ from stderr. Also remove the first "Finished in 0.xx s" line
9+
cat stderr | grep -v "Finished in " | sed -E 's/^[0-9]{1,2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}://' | sed '/^[[:space:]]*\/home\//d' > stderr_cleaned
10+
11+
echo "Stdout" >&2
12+
echo "------------------------------------------------" >&2
13+
cat stdout >&2
14+
echo "Stderr" >&2
15+
echo "------------------------------------------------" >&2
16+
cat stderr_cleaned >&2
17+
18+
res=0
19+
20+
# Output markers around diff to render it nicely in markdown
21+
echo "Test Results diff:"
22+
echo "\`\`\`diff"
23+
if ! diff stdout expected_test_results.txt; then
24+
res=1
25+
fi
26+
27+
28+
echo "\`\`\`"
29+
30+
echo "Stderr diff:"
31+
echo "\`\`\`diff"
32+
#if !diff stderr expected_stderr.txt; then
33+
# res=1
34+
#fi
35+
cat stderr_cleaned
36+
echo "\`\`\`"
37+
38+
rm -f stdout stderr stderr_cleaned
39+
40+
#exit $res
741
exit 1

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

+120-51
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ cortex-m = { version = "0.7.7", features = ["inline-asm", "critical-section-sing
1010
cortex-m-rt = "0.7.3"
1111
panic-probe = "0.3"
1212
rtt-target = { version = "0.6.1", features = ["log"] }
13-
14-
embassy-stm32 = { git = "https://github.com/embassy-rs/embassy", rev = "ed3da1721a4f704d3f2a8a1cf84d9fc051c71945", features = ["time-driver-any", "memory-x", "unstable-pac", "exti"] }
13+
embassy-executor = { version = "0.6.3", features = ["arch-cortex-m", "executor-thread", "integrated-timers"] }
14+
embassy-stm32 = { version = "0.1.0", features = ["time-driver-any", "memory-x", "unstable-pac", "exti"] }
15+
embassy-time = "0.3.2"
1516
log = "0.4.22"
1617

1718
[dev-dependencies]
18-
embedded-test = { version = "0.5.0" }
19+
embedded-test = { path = "../../..", features = ["embassy", "log"] }
1920

2021
[[test]]
2122
name = "example_test"

0 commit comments

Comments
 (0)