Refactor ci/script.sh to factor our linker

Author: adamgreig

ci/script.sh

@@ -32,80 +32,40 @@ main() {
     local fail_examples=(
         data_overflow
     )
+    local linkers=(
+        # Link with arm-none-eabi-ld
+        "-C linker=arm-none-eabi-ld"
+        # Link with arm-none-eabi-gcc, requires -nostartfiles
+        "-C linker=arm-none-eabi-gcc -C link-arg=-nostartfiles"
+        # Link with rust-lld (default)
+        ""
+    )
     if [ "$TARGET" != x86_64-unknown-linux-gnu ]; then
         RUSTDOCFLAGS="-Cpanic=abort" cargo test --doc
 
-        # linking with GNU LD
-        for ex in "${examples[@]}"; do
-            cargo rustc --target "$TARGET" --example "$ex" -- \
-                  -C linker=arm-none-eabi-ld
-
-            cargo rustc --target "$TARGET" --example "$ex" --release -- \
-                  -C linker=arm-none-eabi-ld
-        done
-        for ex in "${fail_examples[@]}"; do
-            ! cargo rustc --target "$TARGET" --example "$ex" -- \
-                  -C linker=arm-none-eabi-ld
-
-            ! cargo rustc --target "$TARGET" --example "$ex" --release -- \
-                  -C linker=arm-none-eabi-ld
-        done
-
-        cargo rustc --target "$TARGET" --example device --features device -- \
-              -C linker=arm-none-eabi-ld
-
-        cargo rustc --target "$TARGET" --example device --features device --release -- \
-              -C linker=arm-none-eabi-ld
-
-        # linking with GNU GCC
-        for ex in "${examples[@]}"; do
-            cargo rustc --target "$TARGET" --example "$ex" -- \
-                  -C linker=arm-none-eabi-gcc -C link-arg=-nostartfiles
-
-            cargo rustc --target "$TARGET" --example "$ex" --release -- \
-                  -C linker=arm-none-eabi-gcc -C link-arg=-nostartfiles
+        for linker in "${linkers[@]}"; do
+            for ex in "${examples[@]}"; do
+                cargo rustc --target "$TARGET" --example "$ex" -- $linker
+                cargo rustc --target "$TARGET" --example "$ex" --release -- $linker
+            done
+            for ex in "${fail_examples[@]}"; do
+                ! cargo rustc --target "$TARGET" --example "$ex" -- $linker
+                ! cargo rustc --target "$TARGET" --example "$ex" --release -- $linker
+            done
+            cargo rustc --target "$TARGET" --example device --features device -- $linker
+            cargo rustc --target "$TARGET" --example device --features device --release -- $linker
         done
-        for ex in "${fail_examples[@]}"; do
-            ! cargo rustc --target "$TARGET" --example "$ex" -- \
-                  -C linker=arm-none-eabi-gcc -C link-arg=-nostartfiles
-
-            ! cargo rustc --target "$TARGET" --example "$ex" --release -- \
-                  -C linker=arm-none-eabi-gcc -C link-arg=-nostartfiles
-        done
-
-        cargo rustc --target "$TARGET" --example device --features device -- \
-              -C linker=arm-none-eabi-gcc -C link-arg=-nostartfiles
-
-        cargo rustc --target "$TARGET" --example device --features device --release -- \
-              -C linker=arm-none-eabi-gcc -C link-arg=-nostartfiles
-
-        # linking with rustc's LLD
-        for ex in "${examples[@]}"; do
-            cargo rustc --target "$TARGET" --example "$ex"
-            cargo rustc --target "$TARGET" --example "$ex" --release
-        done
-        for ex in "${fail_examples[@]}"; do
-            ! cargo rustc --target "$TARGET" --example "$ex"
-            ! cargo rustc --target "$TARGET" --example "$ex" --release
-        done
-
-        cargo rustc --target "$TARGET" --example device --features device
-        cargo rustc --target "$TARGET" --example device --features device --release
     fi
 
     case $TARGET in
         thumbv6m-none-eabi|thumbv7m-none-eabi)
-            # linking with GNU LD
-            env RUSTFLAGS="-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x" cargo run --target "$TARGET" --example qemu | grep "x = 42"
-            env RUSTFLAGS="-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x" cargo run --target "$TARGET" --example qemu --release | grep "x = 42"
-
-            # linking with GNU GCC
-            env RUSTFLAGS="-C linker=arm-none-eabi-gcc -C link-arg=-Tlink.x -Clink-arg=-nostartfiles" cargo run --target "$TARGET" --example qemu | grep "x = 42"
-            env RUSTFLAGS="-C linker=arm-none-eabi-gcc -C link-arg=-Tlink.x -Clink-arg=-nostartfiles" cargo run --target "$TARGET" --example qemu --release | grep "x = 42"
+            for linker in "${linkers[@]}"; do
+                env RUSTFLAGS="$linker -C link-arg=-Tlink.x" cargo run \
+                    --target "$TARGET" --example qemu | grep "x = 42"
+                env RUSTFLAGS="$linker -C link-arg=-Tlink.x" cargo run \
+                    --target "$TARGET" --example qemu --release | grep "x = 42"
+            done
 
-            # linking with rustc's LLD
-            cargo run --target "$TARGET" --example qemu | grep "x = 42"
-            cargo run --target "$TARGET" --example qemu --release | grep "x = 42"
             ;;
     esac