Merge pull request #80 from thejpster/update-test-script

Updates test.sh

Author: jonathanpallant

tests.sh

@@ -8,13 +8,19 @@ rustup target add armv7r-none-eabihf
 rustup target add armv7a-none-eabi
 rustup component add rust-src
 
+# Set this to 1 to exit on the first error
+EXIT_FAST=0
+
 FAILURE=0
 
 fail() {
     echo "***************************************************"
     echo "test.sh MISMATCH: Binary $1 for target $2 mismatched"
     echo "***************************************************"
     FAILURE=1
+    if [ $EXIT_FAST == "1" ]; then
+        exit 1
+    fi
 }
 
 mkdir -p ./target
@@ -29,52 +35,65 @@ my_diff() {
     # output
     # - Fix the CRLF line endings in the files on disk, because git adds them to
     # text files.
-    diff <(cat $file_a | tr -d '\r') <(cat $file_b | sed 's~\\\\~/~g')
+    if [ ! -f $1 ]; then
+        echo "File $1 is missing?!"
+        return 1
+    elif [ ! -f $1 ]; then
+        echo "File $2 is missing?!"
+        return 1
+    else
+        diff <(cat $file_a | tr -d '\r') <(cat $file_b | sed 's~\\\\~/~g')
+    fi
 }
 
 # armv7r-none-eabi tests
+cargo build ${versatile_ab_cargo} --target=armv7r-none-eabi || exit 1
 for bin_path in $(ls examples/versatileab/src/bin/*.rs); do
     filename=${bin_path##*/}
     binary=${filename%.rs}
-    cargo run ${versatile_ab_cargo} --target=armv7r-none-eabi --bin $binary | tee ./target/$binary-armv7r-none-eabi.out
+    cargo run ${versatile_ab_cargo} --target=armv7r-none-eabi --bin $binary > ./target/$binary-armv7r-none-eabi.out
     my_diff ./examples/versatileab/reference/$binary-armv7r-none-eabi.out ./target/$binary-armv7r-none-eabi.out || fail $binary "armv7r-none-eabi"
 done
 
 # armv7r-none-eabihf tests
+cargo build ${versatile_ab_cargo} --target=armv7r-none-eabihf || exit 1
 for bin_path in $(ls examples/versatileab/src/bin/*.rs); do
     filename=${bin_path##*/}
     binary=${filename%.rs}
-    cargo run ${versatile_ab_cargo} --target=armv7r-none-eabihf --bin $binary | tee ./target/$binary-armv7r-none-eabihf.out
+    cargo run ${versatile_ab_cargo} --target=armv7r-none-eabihf --bin $binary > ./target/$binary-armv7r-none-eabihf.out
     my_diff ./examples/versatileab/reference/$binary-armv7r-none-eabihf.out ./target/$binary-armv7r-none-eabihf.out || fail $binary "armv7r-none-eabihf"
 done
 
 # armv7a-none-eabi tests
+cargo build ${versatile_ab_cargo} --target=armv7a-none-eabi || exit 1
 for bin_path in $(ls examples/versatileab/src/bin/*.rs); do
     filename=${bin_path##*/}
     binary=${filename%.rs}
-    cargo run ${versatile_ab_cargo} --target=armv7a-none-eabi --bin $binary | tee ./target/$binary-armv7a-none-eabi.out
+    cargo run ${versatile_ab_cargo} --target=armv7a-none-eabi --bin $binary > ./target/$binary-armv7a-none-eabi.out
     my_diff ./examples/versatileab/reference/$binary-armv7a-none-eabi.out ./target/$binary-armv7a-none-eabi.out || fail $binary "armv7a-none-eabi"
 done
 
 # armv7a-none-eabihf tests
+RUSTC_BOOTSTRAP=1 cargo build ${versatile_ab_cargo} --target=armv7a-none-eabihf || exit 1
 for bin_path in $(ls examples/versatileab/src/bin/*.rs); do
     filename=${bin_path##*/}
     binary=${filename%.rs}
-    RUSTC_BOOTSTRAP=1 cargo run ${versatile_ab_cargo} --target=armv7a-none-eabihf --bin $binary | tee ./target/$binary-armv7a-none-eabihf.out
+    RUSTC_BOOTSTRAP=1 cargo run ${versatile_ab_cargo} --target=armv7a-none-eabihf --bin $binary > ./target/$binary-armv7a-none-eabihf.out
     my_diff ./examples/versatileab/reference/$binary-armv7a-none-eabihf.out ./target/$binary-armv7a-none-eabihf.out || fail $binary "armv7a-none-eabihf"
 done
 
 # These tests only run on QEMU 9 or higher.
 # Ubuntu 24.04 supplies QEMU 8, which doesn't support the machine we have configured for this target
+RUSTC_BOOTSTRAP=1 cargo build ${mps3_an536_cargo} --target=armv8r-none-eabihf --features=gic || exit 1
 if qemu-system-arm --version | grep "version \(9\|10\)"; then
     # armv8r-none-eabihf tests
     for bin_path in $(ls examples/mps3-an536/src/bin/*.rs); do
         filename=${bin_path##*/}
         binary=${filename%.rs}
-        RUSTC_BOOTSTRAP=1 cargo run ${mps3_an536_cargo} --target=armv8r-none-eabihf --bin $binary --features=gic -Zbuild-std=core | tee ./target/$binary-armv8r-none-eabihf.out
+        RUSTC_BOOTSTRAP=1 cargo run ${mps3_an536_cargo} --target=armv8r-none-eabihf --bin $binary --features=gic > ./target/$binary-armv8r-none-eabihf.out
         my_diff ./examples/mps3-an536/reference/$binary-armv8r-none-eabihf.out ./target/$binary-armv8r-none-eabihf.out || fail $binary "armv8r-none-eabihf"
     done
-    RUSTC_BOOTSTRAP=1 cargo run ${mps3_an536_cargo} --target=armv8r-none-eabihf --bin smp_test --features=gic -Zbuild-std=core -- -smp 2 | tee ./target/smp_test-armv8r-none-eabihf_smp2.out
+    RUSTC_BOOTSTRAP=1 cargo run ${mps3_an536_cargo} --target=armv8r-none-eabihf --bin smp_test --features=gic -- -smp 2 > ./target/smp_test-armv8r-none-eabihf_smp2.out
     my_diff ./examples/mps3-an536/reference/smp_test-armv8r-none-eabihf_smp2.out ./target/smp_test-armv8r-none-eabihf_smp2.out || fail smp_test "armv8r-none-eabihf"
 fi