nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-15 05:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add test case for issue #1111, by adding another route by which a test file's config can be located

Browse Source
This commit is contained in:
Stuart Dootson 2016-08-08 23:13:45 +02:00
parent 69f647b9f1
commit cb0b7108ca
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/config/issue-1111.toml Executable file
View File

@ -0,0 +1 @@
reorder_imports = true

1
tests/source/issue-1111.rs Normal file
View File

@ -0,0 +1 @@
use bar;

9
tests/system.rs
View File

@ -205,7 +205,11 @@ fn print_mismatches(result: HashMap<String, Vec<Mismatch>>) {
fn read_config(filename: &str) -> Config {
let sig_comments = read_significant_comments(&filename);
let mut config = get_config(sig_comments.get("config").map(|x| &(*x)[..]));
let mut config = if !sig_comments.is_empty() {
get_config(sig_comments.get("config").map(|x| &(*x)[..]))
} else {
get_config(Path::new(filename).with_extension("toml").file_name().and_then(std::ffi::OsStr::to_str))
};
for (key, val) in &sig_comments {
if key != "target" && key != "config" {
@ -253,6 +257,9 @@ fn get_config(config_file: Option<&str>) -> Config {
Some(file_name) => {
let mut full_path = "tests/config/".to_owned();
full_path.push_str(&file_name);
if !Path::new(&full_path).exists() {
return Default::default();
};
full_path
}
};

1
tests/target/issue-1111.rs Normal file
View File

@ -0,0 +1 @@
use bar;