user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

putting the failure_status code in header.rs

Browse source
This commit is contained in:
Quentin Boyer 2019-11-07 21:53:00 +01:00
parent 9305e606e1
commit 5852a3f4e9
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -585,6 +585,9 @@ impl TestProps {
_ => 1,
};
}
if self.should_ice {
self.failure_status = 101;
}
for key in &["RUST_TEST_NOCAPTURE", "RUST_TEST_THREADS"] {
if let Ok(val) = env::var(key) {

7
src/tools/compiletest/src/runtest.rs
View file

@ -434,12 +434,7 @@ impl<'test> TestCx<'test> {
}
fn check_correct_failure_status(&self, proc_res: &ProcRes) {
let expected_status =
if self.props.should_ice {
Some(101)
} else {
Some(self.props.failure_status)
};
let expected_status = Some(self.props.failure_status);
let received_status = proc_res.status.code();
if expected_status != received_status {