Skip to content

Commit b1fc71e

Browse files
author
Jorge Aparicio
committed
CI: fix test
1 parent c33ce8c commit b1fc71e

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

ci/script.sh

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
set -ex
22

33
test_gen() {
4-
echo 'extern crate volatile_register;' > $td/src/lib.rs
5-
cross run --target $TARGET --release -- -i $td/$svd $1 >> $td/src/lib.rs
6-
cross build --manifest-path $td --target $TARGET
4+
cargo run --target $TARGET --release -- -i $td/$svd $1 > $td/src/lib.rs
5+
echo 'extern crate volatile_register;' >> $td/src/lib.rs
6+
cargo build --manifest-path $td/Cargo.toml --target $TARGET
77
}
88

99
main() {
10-
cross build --target $TARGET
11-
cross build --target $TARGET --release
10+
cargo build --target $TARGET
11+
cargo build --target $TARGET --release
1212

13-
if [ -n $DISABLE_TESTS ]; then
13+
if [ ! -z $DISABLE_TESTS ]; then
1414
return
1515
fi
1616

@@ -23,11 +23,8 @@ main() {
2323
;;
2424
esac
2525

26-
mv $td .
27-
td=$(basename $td)
28-
2926
# test crate
30-
cross init --name foo $td
27+
cargo init --name foo $td
3128
echo 'volatile-register = "0.1.0"' >> $td/Cargo.toml
3229

3330
curl -L \
@@ -38,10 +35,6 @@ main() {
3835
https://raw.githubusercontent.com/posborne/cmsis-svd/python-0.4/data/Nordic/nrf51.svd \
3936
> $td/nrf51.svd
4037

41-
curl -L \
42-
https://raw.githubusercontent.com/posborne/cmsis-svd/python-0.4/data/NXP/LPC43xx_svd_v5.svd \
43-
> $td/LPC43xx_svd_v5.svd
44-
4538
# test the generated code
4639
svd=STM32F30x.svd
4740
test_gen
@@ -61,11 +54,6 @@ main() {
6154
test_gen gpio
6255
test_gen timer
6356

64-
# japaric/svd2rust#42
65-
svd=LPC43xx_svd_v5.svd
66-
test_gen
67-
test_gen sct
68-
6957
rm -rf $td
7058
}
7159

0 commit comments

Comments
 (0)