Skip to content

Commit 99c55c7

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

9 files changed

+244
-69
lines changed
+44-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,46 @@
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

7-
exit 1
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+
# only fetch log rtt logs from stderr, ignore backtraces for now, remove function addresses
9+
cat stderr | sed -nE 's/^[0-9]{1,2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}: (TRACE|DEBUG|INFO|WARN|ERROR)/\1/p' | sed 's/ function: 0x[0-9a-fA-F]\{1,\},//g'> rtt_logs
10+
11+
echo "------------------------------------------------" >&2
12+
echo "Stdout" >&2
13+
echo "------------------------------------------------" >&2
14+
cat stdout >&2
15+
echo "------------------------------------------------" >&2
16+
echo "Stderr" >&2
17+
echo "------------------------------------------------" >&2
18+
cat stderr >&2
19+
echo "------------------------------------------------" >&2
20+
echo "Rtt logs" >&2
21+
echo "------------------------------------------------" >&2
22+
cat rtt_logs >&2
23+
echo "------------------------------------------------" >&2
24+
25+
res=0
26+
27+
# Output markers around diff to render it nicely in markdown
28+
echo "Test Results diff:"
29+
echo "\`\`\`diff"
30+
if ! diff expected_test_results.txt stdout; then
31+
res=1
32+
fi
33+
34+
35+
echo "\`\`\`"
36+
37+
echo "Rtt logs diff:"
38+
echo "\`\`\`diff"
39+
if ! diff expected_rtt_logs.txt rtt_logs; then
40+
res=1
41+
fi
42+
echo "\`\`\`"
43+
44+
rm -f stdout stderr rtt_logs
45+
46+
exit $res

.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)