bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

compiletest: Match suffixed environments

Browse source 
This fixes a case where an `ignore-musl` test was not ignored on
`armv7-unknown-linux-musleabihf` because the environment did not exactly
match. Only enforce that the environment starts with the argument to
`ignore-`.
This commit is contained in:
Samuel Holland 2019-09-02 22:10:10 -05:00
parent ef54f57c5b
commit 2bcabf6737
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/compiletest/src/header.rs
View file

@ -835,10 +835,10 @@ impl Config {
if name == "test" || if name == "test" ||
util::matches_os(&self.target, name) || // target util::matches_os(&self.target, name) || // target
util::matches_env(&self.target, name) || // env
name == util::get_arch(&self.target) || // architecture name == util::get_arch(&self.target) || // architecture
name == util::get_pointer_width(&self.target) || // pointer width name == util::get_pointer_width(&self.target) || // pointer width
name == self.stage_id.split('-').next().unwrap() || // stage name == self.stage_id.split('-').next().unwrap() || // stage
Some(name) == util::get_env(&self.target) || // env
(self.target != self.host && name == "cross-compile") || (self.target != self.host && name == "cross-compile") ||
match self.compare_mode { match self.compare_mode {
Some(CompareMode::Nll) => name == "compare-mode-nll", Some(CompareMode::Nll) => name == "compare-mode-nll",

8
src/tools/compiletest/src/util.rs
View file

@ -105,8 +105,12 @@ pub fn get_arch(triple: &str) -> &'static str {
panic!("Cannot determine Architecture from triple"); panic!("Cannot determine Architecture from triple");
} }
pub fn get_env(triple: &str) -> Option<&str> { pub fn matches_env(triple: &str, name: &str) -> bool {
triple.split('-').nth(3) if let Some(env) = triple.split('-').nth(3) {
env.starts_with(name)
} else {
false
}
} }
pub fn get_pointer_width(triple: &str) -> &'static str { pub fn get_pointer_width(triple: &str) -> &'static str {