Avoid overriding $RUSTFLAGS when needed for rustc 1.63

[dnssec-prover] / test.sh

diff --git a/test.sh b/test.sh
index 4d89ab0233fe1cfd82b8f22a16d0a31a41b4799d..e2f7039b35c139f44588c3778ca12545544d68d4 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -1,6 +1,12 @@
 #!/bin/sh
 set -eox
-export RUSTC_BOOTSTRAP=1
+
+RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }')
+if [ "$RUSTC_MINOR_VERSION" = 63 ]; then
+       export RUSTC_BOOTSTRAP=1
+       export RUSTFLAGS=--cfg=rust_1_63
+fi
+
 cargo test --no-default-features
 cargo test
 cargo test --no-default-features --features std
@@ -17,6 +23,6 @@ cargo build --lib --features std,tokio,validation --release
 cargo build --bin http_proof_gen --features build_server
 cargo doc --features std,tokio,validation
 cd fuzz
-RUSTFLAGS=--cfg=fuzzing RUSTC_BOOTSTRAP=1 cargo build --features stdin_fuzz
+RUSTFLAGS="$RUSTFLAGS --cfg=fuzzing" RUSTC_BOOTSTRAP=1 cargo build --features stdin_fuzz
 cd ../bench
-RUSTFLAGS="--cfg=dnssec_validate_bench" cargo bench
+RUSTFLAGS="$RUSTFLAGS --cfg=dnssec_validate_bench" cargo bench