Skip to content

Commit cf3b191

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

File tree

9 files changed

+194
-69
lines changed

9 files changed

+194
-69
lines changed
Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
set -e
33
set -x
44

5-
/home/probe-rs-runner/probe-rs run "$TARGET" $TARGET_CONFIG
5+
touch stdout
6+
touch stderr
67

7-
exit 1
8+
/home/probe-rs-runner/probe-rs run --disable-progressbars "$TARGET" $TARGET_CONFIG --format=json 2> stderr | jq -c 'del(.exec_time)' >stdout
9+
10+
diff stdout expected_test_results.txt
11+
12+
rm -f stdout
13+
rm -f stderr

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

Lines changed: 119 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 4 additions & 3 deletions
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"] }
1920

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

.github/test-projects/stm32/build.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ set -x
99
set -e
1010

1111
# to show a possible error in the output
12-
cargo test --target "$2" --features embassy-stm32/"$1" --release --test example_test --no-run
12+
cargo test --locked --target "$2" --features embassy-stm32/"$1" --release --test example_test --no-run
1313

1414
# Copy artifact to output directory
15-
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')
15+
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')
1616
mkdir -p output
17-
cp "$exec" output/"$1"
17+
cp "$exec" output/"$1"
18+
cp expected_test_results.txt output/
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{"type":"suite","event":"started","test_count":8}
2+
{"type":"test","event":"started","name":"test::test"}
3+
{"type":"test","name":"test::test","event":"ok"}
4+
{"type":"test","event":"started","name":"test::it_fails1"}
5+
{"type":"test","name":"test::it_fails1","event":"failed","stdout":"Error: \"Test should Pass but it did Panic\"\n"}
6+
{"type":"test","event":"started","name":"test::it_fails2"}
7+
{"type":"test","name":"test::it_fails2","event":"failed","stdout":"Error: \"Test should Pass but it did Panic\"\n"}
8+
{"type":"test","event":"started","name":"test::it_passes"}
9+
{"type":"test","name":"test::it_passes","event":"ok"}
10+
{"type":"test","event":"started","name":"test::it_fails3"}
11+
{"type":"test","name":"test::it_fails3","event":"failed","stdout":"Error: \"Test should Panic but it did Pass\"\n"}
12+
{"type":"test","event":"started","name":"test::it_timeouts"}
13+
{"type":"test","name":"test::it_timeouts","event":"failed","stdout":"Error: \"Test timed out after 3s\"\n"}
14+
{"type":"test","event":"started","name":"test::async_test"}
15+
{"type":"test","name":"test::async_test","event":"ok"}
16+
{"type":"suite","event":"failed","passed":3,"failed":4,"ignored":0,"measured":0,"filtered_out":0}

0 commit comments

Comments
 (0)