mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compiletest: don't overwrite failure-status if it was previously set

Browse Source
This commit is contained in:
QuietMisdreavus 2018-07-20 13:25:44 -05:00
parent d3569d2da8
commit e3bc713e2e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/compiletest/src/header.rs
View File

@ -392,11 +392,6 @@ impl TestProps {
if let Some(code) = config.parse_failure_status(ln) {
self.failure_status = code;
} else {
self.failure_status = match config.mode {
Mode::RunFail => 101,
_ => 1,
};
}
if !self.run_rustfix {
@ -404,6 +399,13 @@ impl TestProps {
}
});
if self.failure_status == -1 {
self.failure_status = match config.mode {
Mode::RunFail => 101,
_ => 1,
};
}
for key in &["RUST_TEST_NOCAPTURE", "RUST_TEST_THREADS"] {
if let Ok(val) = env::var(key) {
if self.exec_env.iter().find(|&&(ref x, _)| x == key).is_none() {