Make assembly test script simpler

madsmtm · Aug 27, 2023 · fb05ad4 · fb05ad4
1 parent 2b706ee
commit fb05ad4
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/helper-scripts/run-assembly-tests.sh b/helper-scripts/run-assembly-tests.sh
@@ -4,30 +4,26 @@
 
 set -euxo pipefail
 
-ARGS="run --features=run --bin=test-assembly --  -Zbuild-std --target"
+echo Building assembly tester
+cargo build --features=run --bin=test-assembly
 
-# Add `+nightly` when using `-Zbuild-std` if the user's `cargo` is not a
-# `nightly` by default
-if grep -q nightly <<< $(cargo --version); then
-    NIGHTLY=""
-else
-    NIGHTLY="+nightly"
-fi
+RUN="./target/debug/test-assembly -Zbuild-std --target"
+export RUSTUP_TOOLCHAIN="nightly"
 
 echo "Apple"
-cargo $NIGHTLY $ARGS x86_64-apple-darwin
-cargo $NIGHTLY $ARGS aarch64-apple-darwin
-cargo $NIGHTLY $ARGS armv7s-apple-ios
-cargo $NIGHTLY $ARGS armv7-apple-ios
-cargo $NIGHTLY $ARGS i386-apple-ios
+$RUN x86_64-apple-darwin
+$RUN aarch64-apple-darwin
+$RUN armv7s-apple-ios
+$RUN armv7-apple-ios
+$RUN i386-apple-ios
 
 echo "Old Apple"
-cargo $NIGHTLY $ARGS i686-apple-darwin
+$RUN i686-apple-darwin
 
 echo "GNUStep"
-cargo $NIGHTLY $ARGS x86_64-unknown-linux-gnu --no-default-features --features=std,gnustep-2-1
-cargo $NIGHTLY $ARGS i686-unknown-linux-gnu --no-default-features --features=std,gnustep-2-1
+$RUN x86_64-unknown-linux-gnu --no-default-features --features=std,gnustep-2-1
+$RUN i686-unknown-linux-gnu --no-default-features --features=std,gnustep-2-1
 
 echo "Old GNUStep"
-cargo $NIGHTLY $ARGS x86_64-unknown-linux-gnu --no-default-features --features=std,gnustep-1-7
-cargo $NIGHTLY $ARGS i686-unknown-linux-gnu --no-default-features --features=std,gnustep-1-7
+$RUN x86_64-unknown-linux-gnu --no-default-features --features=std,gnustep-1-7
+$RUN i686-unknown-linux-gnu --no-default-features --features=std,gnustep-1-7