Skip to content

Commit 0d6d597

Browse files
authored
defmt: 0.2 -> 0.3
1 parent 452f674 commit 0d6d597

File tree

17 files changed

+128
-214
lines changed

17 files changed

+128
-214
lines changed

.cargo/config.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ run-ex = "run -p examples --target thumbv7em-none-eabi --example"
1313
# cargo test-aes
1414
# cargo test-subghz -- --probe 001D00145553500A20393256
1515
# cargo test-subghz -- --probe 001600345553500A20393256
16-
test-adc = "run -p testsuite --target thumbv7em-none-eabi --bin adc"
17-
test-aes = "run -p testsuite --target thumbv7em-none-eabi --bin aes"
18-
test-dac = "run -p testsuite --target thumbv7em-none-eabi --bin dac"
19-
test-i2c = "run -p testsuite --target thumbv7em-none-eabi --bin i2c"
20-
test-lptim = "run -p testsuite --target thumbv7em-none-eabi --bin lptim"
21-
test-pka = "run -p testsuite --target thumbv7em-none-eabi --bin pka"
22-
test-rcc = "run -p testsuite --target thumbv7em-none-eabi --bin rcc"
23-
test-rng = "run -p testsuite --target thumbv7em-none-eabi --bin rng"
24-
test-rtc = "run -p testsuite --target thumbv7em-none-eabi --bin rtc"
25-
test-spi = "run -p testsuite --target thumbv7em-none-eabi --bin spi"
26-
test-subghz = "run -p testsuite --target thumbv7em-none-eabi --bin subghz"
27-
test-uart = "run -p testsuite --target thumbv7em-none-eabi --bin uart"
16+
test-adc = "test -p testsuite --target thumbv7em-none-eabi --bin adc"
17+
test-aes = "test -p testsuite --target thumbv7em-none-eabi --bin aes"
18+
test-dac = "test -p testsuite --target thumbv7em-none-eabi --bin dac"
19+
test-i2c = "test -p testsuite --target thumbv7em-none-eabi --bin i2c"
20+
test-lptim = "test -p testsuite --target thumbv7em-none-eabi --bin lptim"
21+
test-pka = "test -p testsuite --target thumbv7em-none-eabi --bin pka"
22+
test-rcc = "test -p testsuite --target thumbv7em-none-eabi --bin rcc"
23+
test-rng = "test -p testsuite --target thumbv7em-none-eabi --bin rng"
24+
test-rtc = "test -p testsuite --target thumbv7em-none-eabi --bin rtc"
25+
test-spi = "test -p testsuite --target thumbv7em-none-eabi --bin spi"
26+
test-subghz = "test -p testsuite --target thumbv7em-none-eabi --bin subghz"
27+
test-uart = "test -p testsuite --target thumbv7em-none-eabi --bin uart"
2828

2929
# e.g. cargo unit
3030
unit = "test --features stm32wl5x_cm4"

.github/workflows/ci.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,25 @@ jobs:
6363
with:
6464
toolchain: stable
6565
target: thumbv7em-none-eabi
66-
- run: cargo build -p testsuite --target thumbv7em-none-eabi --bins
66+
- run: cargo test -p testsuite --target thumbv7em-none-eabi --bins --no-run
6767
- name: Upload test binaries
6868
uses: actions/upload-artifact@v2
6969
with:
7070
name: test-bins
7171
if-no-files-found: error
7272
retention-days: 1
7373
path: |
74-
target/thumbv7em-none-eabi/debug/*
75-
!target/thumbv7em-none-eabi/debug/*.cargo-lock
76-
!target/thumbv7em-none-eabi/debug/*.d
77-
!target/thumbv7em-none-eabi/debug/.fingerprint/**/*
78-
!target/thumbv7em-none-eabi/debug/build/**/*
79-
!target/thumbv7em-none-eabi/debug/deps/**/*
80-
!target/thumbv7em-none-eabi/debug/examples/**/*
81-
!target/thumbv7em-none-eabi/debug/incremental/**/*
74+
target/thumbv7em-none-eabi/debug/deps/*
75+
!target/thumbv7em-none-eabi/debug/deps/*.cargo-lock
76+
!target/thumbv7em-none-eabi/debug/deps/*.d
77+
!target/thumbv7em-none-eabi/debug/deps/*.meta
78+
!target/thumbv7em-none-eabi/debug/deps/*.rlib
79+
!target/thumbv7em-none-eabi/debug/deps/*.rmeta
80+
!target/thumbv7em-none-eabi/debug/deps/.fingerprint/**/*
81+
!target/thumbv7em-none-eabi/debug/deps/build/**/*
82+
!target/thumbv7em-none-eabi/debug/deps/deps/**/*
83+
!target/thumbv7em-none-eabi/debug/deps/examples/**/*
84+
!target/thumbv7em-none-eabi/debug/deps/incremental/**/*
8285
8386
testsuite:
8487
name: Run Testsuite
@@ -98,7 +101,7 @@ jobs:
98101
run: |
99102
count=0
100103
for binpath in bins/*; do
101-
if [[ "$binpath" != "bins/subghz" ]]; then
104+
if [[ "$binpath" != bins/subghz* ]]; then
102105
# alternate probes to wear out flash evenly
103106
if (( count % 2 )); then
104107
probe="002900205553500A20393256"
@@ -113,9 +116,11 @@ jobs:
113116
fi
114117
done
115118
116-
echo "Running subghz"
117-
probe-run --chip STM32WLE5JCIx --connect-under-reset bins/subghz --probe 002900205553500A20393256 &
118-
probe-run --chip STM32WLE5JCIx --connect-under-reset bins/subghz --probe 0034001A5553500B20393256 &
119+
echo "Spawning subghz job 1"
120+
probe-run --chip STM32WLE5JCIx --connect-under-reset $(find bins -name 'subghz*') --probe 002900205553500A20393256 &
121+
echo "Spawning subghz job 2"
122+
probe-run --chip STM32WLE5JCIx --connect-under-reset $(find bins -name 'subghz*') --probe 0034001A5553500B20393256 &
123+
echo "Waiting for subghz job completion"
119124
120125
wait
121126
echo "Done subghz"

0 commit comments

Comments
 (0)