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

Implement opt-out from UI testing normalization

Browse source
This commit is contained in:
Vadim Petrochenkov 2018-02-24 00:07:51 +03:00
parent fa2d9fc4b9
commit e650eef8b0
4 changed files with 140 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -226,9 +226,10 @@ pub struct TestProps {
pub must_compile_successfully: bool,
// rustdoc will test the output of the `--test` option
pub check_test_line_numbers_match: bool,
// The test must be compiled and run successfully. Only used in UI tests for
// now.
// The test must be compiled and run successfully. Only used in UI tests for now.
pub run_pass: bool,
// Do not pass `-Z ui-testing` to UI tests
pub disable_ui_testing_normalization: bool,
// customized normalization rules
pub normalize_stdout: Vec<(String, String)>,
pub normalize_stderr: Vec<(String, String)>,
@ -259,6 +260,7 @@ impl TestProps {
must_compile_successfully: false,
check_test_line_numbers_match: false,
run_pass: false,
disable_ui_testing_normalization: false,
normalize_stdout: vec![],
normalize_stderr: vec![],
failure_status: 101,
@ -379,6 +381,11 @@ impl TestProps {
config.parse_must_compile_successfully(ln) || self.run_pass;
}
if !self.disable_ui_testing_normalization {
self.disable_ui_testing_normalization =
config.parse_disable_ui_testing_normalization(ln);
}
if let Some(rule) = config.parse_custom_normalization(ln, "normalize-stdout") {
self.normalize_stdout.push(rule);
}
@ -505,6 +512,10 @@ impl Config {
self.parse_name_directive(line, "must-compile-successfully")
}
fn parse_disable_ui_testing_normalization(&self, line: &str) -> bool {
self.parse_name_directive(line, "disable-ui-testing-normalization")
}
fn parse_check_test_line_numbers_match(&self, line: &str) -> bool {
self.parse_name_directive(line, "check-test-line-numbers-match")
}

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

@ -1632,7 +1632,9 @@ impl<'test> TestCx<'test> {
// a first time to get the compiler's output then compile with
// "--error-format json" to check if all expected errors are actually there
// and that no new one appeared.
rustc.arg("-Zui-testing");
if !self.props.disable_ui_testing_normalization {
rustc.arg("-Zui-testing");
}
}
MirOpt => {
rustc.args(&[