Skip to content

Update svd2rust-regress once again #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 20, 2020
Merged

Update svd2rust-regress once again #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/svd2rust-regress/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ version = "0.1.0"
authors = ["James Munns <[email protected]>", "The svd2rust developers"]

[dependencies]
reqwest = "0.9"
rayon = "1.1"
reqwest = { version = "0.10", features= ["blocking"] }
rayon = "1.4"
structopt = "0.2"
error-chain = "0.12"
inflections = "1.1"
26 changes: 9 additions & 17 deletions ci/svd2rust-regress/src/svd_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
use crate::errors::*;
use crate::tests::TestCase;
use reqwest;
use std::fs::{self, File, OpenOptions};
use std::io::prelude::*;
use std::path::PathBuf;
use std::process::{Command, Output};

static CRATES_ALL: &[&str] = &["bare-metal = \"0.2.0\"", "vcell = \"0.1.0\""];
static CRATES_MSP430: &[&str] = &["msp430 = \"0.1.0\""];
static CRATES_CORTEX_M: &[&str] = &["cortex-m = \"0.5.0\"", "cortex-m-rt = \"0.5.0\""];
static CRATES_RISCV: &[&str] = &["riscv = \"0.4.0\"", "riscv-rt = \"0.4.0\""];
static CRATES_XTENSALX6: &[&str] = &["xtensa-lx6-rt = \"0.2.0\"", "xtensa-lx6 = \"0.1.0\""];
static PROFILE_ALL: &[&str] = &["[profile.dev]", "incremental = false"];
static FEATURES_ALL: &[&str] = &["[features]"];
static FEATURES_CORTEX_M: &[&str] =
&["const-fn = [\"bare-metal/const-fn\", \"cortex-m/const-fn\"]"];
static FEATURES_EMPTY: &[&str] = &[];
const CRATES_ALL: &[&str] = &["bare-metal = \"0.2.0\"", "vcell = \"0.1.0\""];
const CRATES_MSP430: &[&str] = &["msp430 = \"0.2.2\""];
const CRATES_CORTEX_M: &[&str] = &["cortex-m = \"0.6.0\"", "cortex-m-rt = \"0.6.0\""];
const CRATES_RISCV: &[&str] = &["riscv = \"0.5.0\"", "riscv-rt = \"0.6.0\""];
const CRATES_XTENSALX6: &[&str] = &["xtensa-lx6-rt = \"0.2.0\"", "xtensa-lx6 = \"0.1.0\""];
const PROFILE_ALL: &[&str] = &["[profile.dev]", "incremental = false"];
const FEATURES_ALL: &[&str] = &["[features]"];

fn path_helper(input: &[&str]) -> PathBuf {
input.iter().collect()
Expand Down Expand Up @@ -137,19 +133,15 @@ pub fn test(
XtensaLX6 => CRATES_XTENSALX6.iter(),
})
.chain(PROFILE_ALL.iter())
.chain(FEATURES_ALL.iter())
.chain(match &t.arch {
CortexM => FEATURES_CORTEX_M.iter(),
_ => FEATURES_EMPTY.iter(),
});
.chain(FEATURES_ALL.iter());

for c in crates {
writeln!(file, "{}", c).chain_err(|| "Failed to append to file!")?;
}

// Download the SVD as specified in the URL
// TODO: Check for existing svd files? `--no-cache` flag?
let svd = reqwest::get(&t.svd_url())
let svd = reqwest::blocking::get(&t.svd_url())
.chain_err(|| "Failed to get svd URL")?
.text()
.chain_err(|| "SVD is bad text")?;
Expand Down