Simplify build script for non-cortex-m targets

Author: Disasm

ci/script.sh

@@ -19,6 +19,21 @@ test_svd() {
     cargo check --manifest-path $td/Cargo.toml
 }
 
+test_svd_for_target() {
+    curl -L --output $td/input.svd $2
+
+    # NOTE we care about errors in svd2rust, but not about errors / warnings in rustfmt
+    local cwd=$(pwd)
+    pushd $td
+    RUST_BACKTRACE=1 $cwd/target/$TARGET/release/svd2rust --target $1 -i input.svd
+
+    mv lib.rs src/lib.rs
+
+    popd
+
+    cargo check --manifest-path $td/Cargo.toml
+}
+
 main() {
     # Ensure that `cargo test` works to avoid surprising people, though it
     # doesn't help with our actual coverage.
@@ -423,52 +438,12 @@ main() {
             echo '[dependencies.riscv-rt]' >> $td/Cargo.toml
             echo 'version = "0.6.0"' >> $td/Cargo.toml
 
-            (
-                cd $td &&
-                    curl -LO \
-                         https://github.com/pftbest/msp430g2553/raw/v0.1.0/msp430g2553.svd
-                cd $td &&
-                    curl -LO \
-                         https://raw.githubusercontent.com/riscv-rust/e310x/master/e310x.svd
-                cd $td &&
-                    curl -LO \
-                         https://raw.githubusercontent.com/riscv-rust/k210-pac/master/k210.svd
-            )
-
-            local cwd=$(pwd)
-
             # Test MSP430
-            pushd $td
-
-            RUST_BACKTRACE=1 $cwd/target/$TARGET/release/svd2rust --target msp430 -i $td/msp430g2553.svd
-            mv $td/lib.rs $td/src/lib.rs
-            rustfmt $td/src/lib.rs || true
-
-            popd
-
-            cargo check --manifest-path $td/Cargo.toml
-
-            # Test RISC-V FE310
-            pushd $td
-
-            RUST_BACKTRACE=1 $cwd/target/$TARGET/release/svd2rust --target riscv -i $td/e310x.svd
-            mv $td/lib.rs $td/src/lib.rs
-            rustfmt $td/src/lib.rs || true
-
-            popd
-
-            cargo check --manifest-path $td/Cargo.toml
-
-            # Test RISC-V K210
-            pushd $td
-
-            RUST_BACKTRACE=1 $cwd/target/$TARGET/release/svd2rust --target riscv -i $td/k210.svd
-            mv $td/lib.rs $td/src/lib.rs
-            rustfmt $td/src/lib.rs || true
-
-            popd
+            test_svd_for_target msp430 https://github.com/pftbest/msp430g2553/raw/v0.1.0/msp430g2553.svd
 
-            cargo check --manifest-path $td/Cargo.toml
+            # Test RISC-V chips
+            test_svd_for_target riscv https://raw.githubusercontent.com/riscv-rust/e310x/master/e310x.svd
+            test_svd_for_target riscv https://raw.githubusercontent.com/riscv-rust/k210-pac/master/k210.svd
         ;;
 
         Nordic)