make tests file yaml

Author: Emilgardis

Cargo.lock

@@ -7,12 +7,13 @@ authors = ["James Munns <james.munns@gmail.com>", "The svd2rust developers"]
 [dependencies]
 clap = { version = "4.1", features = ["color", "derive", "string", "env"] }
 svd2rust = { path = "../../" }
-reqwest = { version = "0.11", features= ["blocking"] }
+reqwest = { version = "0.11", features = ["blocking"] }
 rayon = "1.4"
 anyhow = "1"
 thiserror = "1"
 serde = "1"
 serde_json = "1"
+serde_yaml = "0.9"
 prettyplease = "0.2"
 syn = "2"
 wildmatch = "2.1.1"

ci/svd2rust-regress/Cargo.toml

@@ -241,7 +241,7 @@ pub struct Opts {
     #[clap(global = true, long = "toolchain")] // , env = "RUSTUP_TOOLCHAIN"
     pub rustup_toolchain: Option<String>,
 
-    /// Test cases to run, defaults to `tests.json`
+    /// Test cases to run
     #[clap(global = true, long, default_value = default_test_cases())]
     pub test_cases: std::path::PathBuf,
 
@@ -273,18 +273,18 @@ impl Opts {
     }
 }
 
-/// Hack to use ci/tests.json as default value when running as `cargo run`
+/// Hack to use ci/tests.yml as default value when running as `cargo run`
 fn default_test_cases() -> std::ffi::OsString {
     std::env::var_os("CARGO_MANIFEST_DIR")
         .map(|mut e| {
-            e.extend([std::ffi::OsStr::new("/tests.json")]);
+            e.extend([std::ffi::OsStr::new("/tests.yml")]);
             std::path::PathBuf::from(e)
                 .strip_prefix(std::env::current_dir().unwrap())
                 .unwrap()
                 .to_owned()
                 .into_os_string()
         })
-        .unwrap_or_else(|| std::ffi::OsString::from("tests.json".to_owned()))
+        .unwrap_or_else(|| std::ffi::OsString::from("tests.yml".to_owned()))
 }
 
 fn default_svd2rust() -> std::ffi::OsString {

ci/svd2rust-regress/src/main.rs

@@ -104,12 +104,23 @@ pub fn tests(test_cases: Option<&std::path::Path>) -> Result<&'static [TestCase]
         Ok(cases)
     } else {
         let path = test_cases.ok_or_else(|| anyhow::format_err!("no test cases specified"))?;
-        let cases: Vec<TestCase> = serde_json::from_reader(
-            std::fs::OpenOptions::new()
-                .read(true)
-                .open(path)
-                .with_context(|| format!("couldn't open file {}", path.display()))?,
-        )?;
+        let cases: Vec<TestCase> = if path.extension() != Some(std::ffi::OsStr::new("yml")) {
+            serde_json::from_reader(
+                std::fs::OpenOptions::new()
+                    .read(true)
+                    .open(path)
+                    .with_context(|| format!("couldn't open file {}", path.display()))?,
+            )?
+        } else if path.extension() != Some(std::ffi::OsStr::new("json")) {
+            serde_yaml::from_reader(
+                std::fs::OpenOptions::new()
+                    .read(true)
+                    .open(path)
+                    .with_context(|| format!("couldn't open file {}", path.display()))?,
+            )?
+        } else {
+            anyhow::bail!("unknown file extension for {}", path.display());
+        };
         Ok(TESTS.get_or_init(|| cases))
     }
 }