reenable cmsis tests

Author: burrbull

.gitignore

@@ -2,3 +2,6 @@
 [._]*.sw[a-p]
 Cargo.lock
 target
+cmsis-svd/
+tests/src/cmsis_tests.rs
+tests/src/cmsis_tests/

generate-tests.sh

@@ -9,8 +9,10 @@ elementIn() {
 }
 
 main() {
+    git clone https://github.com/posborne/cmsis-svd || true
+
     local tests_dir=$(pwd)/tests
-    local cmsis_dir=$tests_dir/cmsis_tests
+    local cmsis_dir=$tests_dir/src/cmsis_tests
     local blacklist=(
         # These SVD files have some registers with a `resetValue` bigger than the register itself
         Toshiba/M365
@@ -21,12 +23,14 @@ main() {
         SiliconLabs/SIM3L1x8_SVD
     )
 
-    rm -rf tests/cmsis_tests
-    mkdir -p tests/cmsis_tests
+    rm -rf $cmsis_dir
+    mkdir -p $cmsis_dir
+    >"$cmsis_dir/../cmsis_tests.rs"
 
     local vendor_dir
     for vendor_dir in $(echo cmsis-svd/data/*); do
         local vendor=$(basename $vendor_dir)
+        vendor=${vendor//-/_}
         cat >"$cmsis_dir/$vendor.rs" <<EOF
 #![allow(non_snake_case)]
 
@@ -35,6 +39,7 @@ use svd_parser as svd;
 EOF
 
         local device_path
+
         for device_path in $(find $vendor_dir/* -name '*.svd'); do
             local device=$(basename $device_path)
             device=${device%.svd}
@@ -44,23 +49,25 @@ EOF
             fi
 
             device=${device//./_}
+            device=${device//-/_}
 
             cat >>"$cmsis_dir/$vendor.rs" <<EOF
 #[test]
 fn $device() {
-    let xml = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/$device_path"));
+    use std::io::Read;
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/../$device_path");
+    let mut file = std::fs::File::open(path).unwrap();
+    let mut xml = String::new();
+    file.read_to_string(&mut xml).unwrap();
 
-    svd::parse(xml).unwrap();
+    svd::parse(&xml).unwrap();
 }
 EOF
 	done
-	cat >>"$cmsis_dir/mod.rs" <<EOF
+	cat >>"$cmsis_dir/../cmsis_tests.rs" <<EOF
 pub mod $vendor;
 EOF
     done
-    cat >"$tests_dir/cmsis.rs"<<EOF
-pub mod cmsis_tests;
-EOF
 }
 
 main

svd-parser/Cargo.toml

@@ -20,9 +20,9 @@ expand = ["derive-from"]
 
 [dependencies]
 svd-rs = { version = "0.14.1", path = "../svd-rs" }
-roxmltree = "0.14.1"
-anyhow = "1.0.58"
-thiserror = "1.0.31"
+roxmltree = "0.16.0"
+anyhow = "1.0.68"
+thiserror = "1.0.38"
 
 [dev-dependencies]
 serde_json = { version = "1.0", features = ["preserve_order"] }

svd-parser/src/lib.rs

@@ -137,7 +137,7 @@ pub fn parse_with_config(xml: &str, config: &Config) -> anyhow::Result<Device> {
         Err(e) => {
             let id = e.id;
             let node = tree.get_node(id).unwrap();
-            let pos = tree.text_pos_at(node.range().start);
+            let pos = tree.text_pos_at(node.position());
             let tagname = node.tag_name().name();
             let mut res = Err(e.into());
             if tagname.is_empty() {

tests/Cargo.toml

@@ -11,6 +11,6 @@ publish = false
 svd-rs = { path = "../svd-rs"}
 svd-parser = { path = "../svd-parser"}
 svd-encoder = { path = "../svd-encoder"}
-roxmltree = "0.14.1"
+roxmltree = "0.16"
 xmltree = "0.10.3"
 anyhow = "1.0.45"

tests/src/cmsis_tests.rs

@@ -0,0 +1 @@
+

tests/src/lib.rs

@@ -61,3 +61,4 @@ mod register;
 //mod registerproperties;
 mod usage;
 mod writeconstraint;
+mod cmsis_tests;