Rollup merge of #67735 - petrochenkov:uibool, r=Mark-Simulacrum
Support `-Z ui-testing=yes/no` `ui-testing` is now a boolean option (`-Z ui-testing=yes/no`) and can be specified multiple times with later values overriding earlier values (`-Z ui-testing=yes -Z ui-testing=no` == `-Z ui-testing=no`), so it can be set in a hierarchical way, e.g. UI testing infra may enable it by default with specific tests being able to opt-out. This way we can remove the special opt-out support from `compiletest`. Inspired by https://github.com/rust-lang/rust/pull/67709.
This commit is contained in:
@@ -449,7 +449,7 @@ fn main_options(options: config::Options) -> i32 {
|
||||
options.error_format,
|
||||
None,
|
||||
options.debugging_options.treat_err_as_bug,
|
||||
options.debugging_options.ui_testing,
|
||||
options.debugging_options.ui_testing(),
|
||||
);
|
||||
|
||||
match (options.should_test, options.markdown_input()) {
|
||||
@@ -466,7 +466,7 @@ fn main_options(options: config::Options) -> i32 {
|
||||
let diag_opts = (
|
||||
options.error_format,
|
||||
options.debugging_options.treat_err_as_bug,
|
||||
options.debugging_options.ui_testing,
|
||||
options.debugging_options.ui_testing(),
|
||||
options.edition,
|
||||
);
|
||||
let show_coverage = options.show_coverage;
|
||||
|
||||
Reference in New Issue
Block a user