Merge pull request #279 from Disasm/enable-riscv-tests

Re-enable tests for RISC-V

Author: therealprof

ci/script.sh

@@ -413,19 +413,19 @@ main() {
             echo '[dependencies.msp430]' >> $td/Cargo.toml
             echo 'version = "0.1.0"' >> $td/Cargo.toml
 
-            # echo '[dependencies.riscv]' >> $td/Cargo.toml
-            # echo 'version = "0.2.0"' >> $td/Cargo.toml
+            echo '[dependencies.riscv]' >> $td/Cargo.toml
+            echo 'version = "0.4.0"' >> $td/Cargo.toml
 
-            # echo '[dependencies.riscv-rt]' >> $td/Cargo.toml
-            # echo 'version = "0.2.0"' >> $td/Cargo.toml
+            echo '[dependencies.riscv-rt]' >> $td/Cargo.toml
+            echo 'version = "0.4.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/e310x/master/e310x.svd
             )
 
             local cwd=$(pwd)
@@ -442,16 +442,15 @@ main() {
             cargo check --manifest-path $td/Cargo.toml
 
             # Test RISC-V
+            pushd $td
 
-            # pushd $td
-
-            # target/$TARGET/release/svd2rust --target riscv -i $td/e310x.svd
-            # mv $td/lib.rs $td/src/lib.rs
-            # rustfmt $td/src/lib.rs || true
+            $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
+            popd
 
-            # cargo check --manifest-path $td/Cargo.toml
+            cargo check --manifest-path $td/Cargo.toml
         ;;
 
         Nordic)

ci/svd2rust-regress/src/svd_test.rs

@@ -9,7 +9,7 @@ use tests::TestCase;
 static CRATES_ALL: &[&str] = &["bare-metal = \"0.1.0\"", "vcell = \"0.1.0\""];
 static CRATES_MSP430: &[&str] = &["msp430 = \"0.1.0\""];
 static CRATES_CORTEX_M: &[&str] = &["cortex-m = \"0.4.0\"", "cortex-m-rt = \"0.3.0\""];
-static CRATES_RISCV: &[&str] = &["riscv = \"0.1.4\"", "riscv-rt = \"0.1.3\""];
+static CRATES_RISCV: &[&str] = &["riscv = \"0.4.0\"", "riscv-rt = \"0.4.0\""];
 static PROFILE_ALL: &[&str] = &["[profile.dev]", "incremental = false"];
 
 fn path_helper(input: &[&str]) -> PathBuf {

src/generate/device.rs

@@ -27,7 +27,7 @@ pub fn render(d: &Device, target: &Target, nightly: bool, device_x: &mut String)
         });
     }
 
-    if *target != Target::None && *target != Target::CortexM {
+    if *target != Target::None && *target != Target::CortexM && *target != Target::RISCV {
         out.push(quote! {
             #![cfg_attr(feature = "rt", feature(global_asm))]
             #![cfg_attr(feature = "rt", feature(use_extern_macros))]

src/lib.rs

@@ -82,8 +82,8 @@
 //! - [`vcell`](https://crates.io/crates/vcell) v0.1.x
 //! - [`msp430`](https://crates.io/crates/msp430) v0.1.x if target = msp430.
 //! - [`msp430-rt`](https://crates.io/crates/msp430-rt) v0.1.x if target = msp430.
-//! - [`riscv`](https://crates.io/crates/riscv) v0.3.x if target = riscv.
-//! - [`riscv-rt`](https://crates.io/crates/riscv-rt) v0.3.x if target = riscv.
+//! - [`riscv`](https://crates.io/crates/riscv) v0.4.x if target = riscv.
+//! - [`riscv-rt`](https://crates.io/crates/riscv-rt) v0.4.x if target = riscv.
 //!
 //! The `*-rt` dependencies must be optional only enabled when the "rt" feature is enabled. The
 //! `Cargo.toml` of the device crate will look like this for an msp430 target: