Skip to content

Commit 7fde332

Browse files
committed
Merge #480: Run shellcheck on the ci script
1bbc1e7 Explicitly set RUSTDOCFLAGS (Tobin C. Harding) bf95a02 Use the STD_FEATURES list (Tobin C. Harding) c8dc4b6 Remove TOOLCHAIN (Tobin C. Harding) d14cccb Add alloc to features (Tobin C. Harding) 1194591 Use set -ex instead of /bin/sh -ex (Tobin C. Harding) Pull request description: The first 3 patches are preparatory cleanup in line with what has been done lately in `rust-bitcoin`. The last two are real bugs found by `shellcheck`. Props to dpc for putting me on to `shellcheck`. ACKs for top commit: apoelstra: ACK 1bbc1e7 Tree-SHA512: 9eac1e8a19f2fb7d7413c8b76d8b8c14c1ec88e523565b4b907ef595496e0e59f9ae33896024211990cc59bf82bb36cba09dabeb28605e50d5db075bbe39457a
2 parents 576e10b + 1bbc1e7 commit 7fde332

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

contrib/test.sh

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
1-
#!/bin/sh -ex
1+
#!/bin/sh
22

3-
set -e
3+
set -ex
44

5-
# TODO: Add "alloc" once we bump MSRV to past 1.29
6-
FEATURES="bitcoin_hashes global-context lowmemory rand recovery serde std"
5+
FEATURES="bitcoin_hashes global-context lowmemory rand recovery serde std alloc"
76
# These features are typically enabled along with the 'std' feature, so we test
87
# them together with 'std'.
98
STD_FEATURES="rand-std bitcoin-hashes-std"
109

11-
# Use toolchain if explicitly specified
12-
if [ -n "$TOOLCHAIN" ]
13-
then
14-
alias cargo="cargo +$TOOLCHAIN"
15-
fi
16-
1710
cargo --version
1811
rustc --version
1912

@@ -53,9 +46,10 @@ if [ "$DO_FEATURE_MATRIX" = true ]; then
5346
cargo test --all --no-default-features --features="std,$feature"
5447
done
5548
# Other combos
56-
RUSTFLAGS='--cfg=fuzzing' RUSTDOCFLAGS=$RUSTFLAGS cargo test --all
57-
RUSTFLAGS='--cfg=fuzzing' RUSTDOCFLAGS=$RUSTFLAGS cargo test --all --features="$FEATURES"
49+
RUSTFLAGS='--cfg=fuzzing' RUSTDOCFLAGS='--cfg=fuzzing' cargo test --all
50+
RUSTFLAGS='--cfg=fuzzing' RUSTDOCFLAGS='--cfg=fuzzing' cargo test --all --features="$FEATURES"
5851
cargo test --all --features="rand serde"
52+
cargo test --features="$STD_FEATURES"
5953

6054
if [ "$NIGHTLY" = true ]; then
6155
cargo test --all --all-features

0 commit comments

Comments
 (0)