Add Windows build.

QEMU 9 is available for Windows, but not for Ubuntu 24.04 (unless you compile it from source, and I don't want to do that).

Author: jonathanpallant

.github/workflows/build.yml

@@ -292,19 +292,41 @@ jobs:
         run: |
           cargo test --manifest-path cortex-ar/Cargo.toml
 
-  # Run some programs in QEMU
-  qemu-test:
+  # Run some programs in QEMU 8 on Linux (but not MPS3-AN536 examples)
+  qemu-test-linux:
     runs-on: ubuntu-24.04
     needs: [build-all]
     steps:
-      - run: sudo apt-get -y update && sudo apt-get -y install qemu-system-arm
+      - name: Install QEMU
+        run: sudo apt-get -y update && sudo apt-get -y install qemu-system-arm
       - name: Checkout
         uses: actions/checkout@v4
-      - run: ./tests.sh
+      - name: Run tests in QEMU
+        run: ./tests.sh
+
+  # Run some programs in QEMU 9 on Windows (including MPS3-AN536 examples)
+  qemu-test-windows:
+    runs-on: windows-latest
+    needs: [build-all]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install QEMU
+        run: choco install qemu
+      - name: Run tests in QEMU
+        shell: bash
+        run: PATH=${PATH}:/c/Program\ Files/qemu ./tests.sh
+
+  # Gather all the above qemu jobs together for the purposes of getting an overall pass-fail
+  qemu-test-all:
+    runs-on: ubuntu-24.04
+    needs: [qemu-test-linux, qemu-test-windows]
+    steps:
+      - run: /bin/true
 
   # Gather all the above xxx-all jobs together for the purposes of getting an overall pass-fail
   all:
     runs-on: ubuntu-24.04
-    needs: [docs-all, build-all, fmt-all, unit-test, qemu-test] # not gating on clippy-all
+    needs: [docs-all, build-all, fmt-all, unit-test, qemu-test-all] # not gating on clippy-all
     steps:
       - run: /bin/true

tests.sh

@@ -23,22 +23,32 @@ mkdir -p ./target
 versatile_ab_cargo="--manifest-path examples/versatileab/Cargo.toml"
 mps3_an536_cargo="--manifest-path examples/mps3-an536/Cargo.toml"
 
+my_diff() {
+    file_a=$1
+    file_b=$2
+    # - Fix Windows path separators (\\) to look like UNIX ones (/) in the QEMU
+    # 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')
+}
+
 # armv7r-none-eabi tests
 for binary in hello registers svc; do
     cargo run ${versatile_ab_cargo} --target=armv7r-none-eabi --bin $binary | tee ./target/$binary-armv7r-none-eabi.out
-    diff ./examples/versatileab/reference/$binary-armv7r-none-eabi.out ./target/$binary-armv7r-none-eabi.out || fail $binary "armv7r-none-eabi"
+    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
 for binary in hello registers svc undef-exception prefetch-exception abt-exception; do
     cargo run ${versatile_ab_cargo} --target=armv7r-none-eabihf --bin $binary | tee ./target/$binary-armv7r-none-eabihf.out
-    diff ./examples/versatileab/reference/$binary-armv7r-none-eabihf.out ./target/$binary-armv7r-none-eabihf.out || fail $binary "armv7r-none-eabihf"
+    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
 for binary in hello registers svc undef-exception prefetch-exception abt-exception; do
     cargo run ${versatile_ab_cargo} --target=armv7a-none-eabi --bin $binary | tee ./target/$binary-armv7a-none-eabi.out
-    diff ./examples/versatileab/reference/$binary-armv7a-none-eabi.out ./target/$binary-armv7a-none-eabi.out || fail $binary "armv7a-none-eabi"
+    my_diff ./examples/versatileab/reference/$binary-armv7a-none-eabi.out ./target/$binary-armv7a-none-eabi.out || fail $binary "armv7a-none-eabi"
 done
 
 # These tests only run on QEMU 9 or higher.
@@ -47,7 +57,7 @@ if qemu-system-arm --version | grep "version 9"; then
     # armv8r-none-eabihf tests
     for binary in hello registers svc gic generic_timer; do
         cargo +nightly run ${mps3_an536_cargo} --target=armv8r-none-eabihf --bin $binary --features=gic -Zbuild-std=core | tee ./target/$binary-armv8r-none-eabihf.out
-    diff ./examples/mps3-an536/reference/$binary-armv8r-none-eabihf.out ./target/$binary-armv8r-none-eabihf.out || fail $binary "armv8r-none-eabihf"
+    my_diff ./examples/mps3-an536/reference/$binary-armv8r-none-eabihf.out ./target/$binary-armv8r-none-eabihf.out || fail $binary "armv8r-none-eabihf"
     done
 fi