nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-26 06:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix path issue with tests on Windows

Browse Source 
The code that manipulates paths to try and find files in the target dir
was not handling windows file seperators correctly. The code has been
updated to use the path module, and hopefully will play nicer across
operating systems.
This commit is contained in:
Bryce Van Dyk 2015-10-08 01:10:07 +13:00
parent 5eeae3944e
commit 8be1d1926e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/system.rs
View File

@ -16,6 +16,7 @@ extern crate term;
use std::collections::HashMap;
use std::fs;
use std::io::{self, Read, BufRead, BufReader};
use std::path::Path;
use rustfmt::*;
use rustfmt::config::{Config, ReportTactic};
@ -232,8 +233,19 @@ fn handle_result(result: HashMap<String, String>,
// Map source file paths to their target paths.
fn get_target(file_name: &str, target: Option<&str>) -> String {
if file_name.starts_with("tests/source/") {
let base = target.unwrap_or(file_name.trim_left_matches("tests/source/"));
let file_path = Path::new(file_name);
let source_path_prefix = Path::new("tests/source/");
if file_path.starts_with(source_path_prefix) {
let mut components = file_path.components();
// Can't skip(2) as the resulting iterator can't as_path()
components.next();
components.next();
let new_target = match components.as_path().to_str() {
Some(string) => string,
None => file_name,
};
let base = target.unwrap_or(new_target);
format!("tests/target/{}", base)
} else {