Skip to content

Commit 7b81af0

Browse files
committed
Keep mangled-names as a default feature
1 parent 8661273 commit 7b81af0

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

ci/run.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,26 @@ case $1 in
3030

3131
RUSTFLAGS="-C debug-assertions=no -C lto" \
3232
CARGO_INCREMENTAL=0 \
33-
$run --test $t --features 'no_std mem c' --no-run
33+
$run --test $t --no-default-features \
34+
--features 'no_std mem c' --no-run
3435
qemu-arm-static target/${1}/debug/$t-*
3536
done
3637

3738
for t in $(ls testcrate/tests); do
3839
t=${t%.rs}
3940
RUSTFLAGS="-C lto" \
4041
CARGO_INCREMENTAL=0 \
41-
$run --test $t --features 'no_std mem c' --no-run --release
42+
$run --test $t --no-default-features \
43+
--features 'no_std mem c' --no-run --release
4244
qemu-arm-static target/${1}/release/$t-*
4345
done
4446
;;
4547
*)
4648
run="cargo test --manifest-path testcrate/Cargo.toml --target $1"
47-
$run --features mangled-names
48-
$run --features mangled-names --release
49-
$run --features 'mangled-names c'
50-
$run --features 'mangled-names c' --release
49+
$run
50+
$run --release
51+
$run --features c
52+
$run --features c --release
5153
;;
5254
esac
5355

testcrate/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ utest-macros = { git = "https://github.com/japaric/utest" }
2525
c = ["compiler_builtins/c"]
2626
mem = ["compiler_builtins/mem"]
2727
mangled-names = ["compiler_builtins/mangled-names"]
28+
default = ["mangled-names"]
2829
no_std = []

0 commit comments

Comments
 (0)