update compiletest to support testing if rustfix didnt crash

Author: jdonszelmann

src/tools/compiletest/src/directives.rs

@@ -181,6 +181,8 @@ pub struct TestProps {
  pub run_rustfix: bool,
  // If true, `rustfix` will only apply `MachineApplicable` suggestions.
  pub rustfix_only_machine_applicable: bool,
+ // If true, don't test the fixed program. It's still broken in some way.
+ pub rustfix_dont_test_fixed: bool,
  pub assembly_output: Option<String>,
  // If true, the test is expected to ICE
  pub should_ice: bool,
@@ -245,6 +247,7 @@ mod directives {
  pub const DONT_CHECK_FAILURE_STATUS: &'static str = "dont-check-failure-status";
  pub const RUN_RUSTFIX: &'static str = "run-rustfix";
  pub const RUSTFIX_ONLY_MACHINE_APPLICABLE: &'static str = "rustfix-only-machine-applicable";
+ pub const RUSTFIX_DONT_TEST_FIXED: &'static str = "rustfix-dont-test-fixed";
  pub const ASSEMBLY_OUTPUT: &'static str = "assembly-output";
  pub const STDERR_PER_BITWIDTH: &'static str = "stderr-per-bitwidth";
  pub const INCREMENTAL: &'static str = "incremental";
@@ -304,6 +307,7 @@ impl TestProps {
  dont_check_failure_status: false,
  run_rustfix: false,
  rustfix_only_machine_applicable: false,
+ rustfix_dont_test_fixed: false,
  assembly_output: None,
  should_ice: false,
  stderr_per_bitwidth: false,
@@ -573,6 +577,11 @@ impl TestProps {
  RUSTFIX_ONLY_MACHINE_APPLICABLE,
  &mut self.rustfix_only_machine_applicable,
  );
+ config.set_name_directive(
+ ln,
+ RUSTFIX_DONT_TEST_FIXED,
+ &mut self.rustfix_dont_test_fixed,
+ );
  config.set_name_value_directive(
  ln,
  ASSEMBLY_OUTPUT,

src/tools/compiletest/src/directives/directive_names.rs

@@ -259,6 +259,7 @@ pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
  "run-pass",
  "run-rustfix",
  "rustc-env",
+ "rustfix-dont-test-fixed",
  "rustfix-only-machine-applicable",
  "should-fail",
  "should-ice",

src/tools/compiletest/src/runtest/ui.rs

@@ -220,7 +220,10 @@ impl TestCx<'_> {
  self.check_all_error_patterns(&output_to_check, pattern_proc_res);
  self.check_forbid_output(&output_to_check, pattern_proc_res);
 
- if self.props.run_rustfix && self.config.compare_mode.is_none() {
+ if self.props.run_rustfix
+ && self.config.compare_mode.is_none()
+ && !self.props.rustfix_dont_test_fixed
+ {
  // And finally, compile the fixed code and make sure it both
  // succeeds and has no diagnostics.
  let mut rustc = self.make_compile_args(

tests/ui/parser/attribute/invalid-delimeter-ice-146808.fixed

@@ -1,7 +1,9 @@
 // regression test for #146808
 //@ proc-macro: all_spans_same.rs
 //@ run-rustfix
-//@ rustfix-only-machine-applicable
+// the fixed program is still broken, but rustfix didn't crash!
+// that's what we want to test here.
+//@ rustfix-dont-test-fixed
 
 extern crate all_spans_same;
 

tests/ui/parser/attribute/invalid-delimeter-ice-146808.rs

@@ -1,7 +1,9 @@
 // regression test for #146808
 //@ proc-macro: all_spans_same.rs
 //@ run-rustfix
-//@ rustfix-only-machine-applicable
+// the fixed program is still broken, but rustfix didn't crash!
+// that's what we want to test here.
+//@ rustfix-dont-test-fixed
 
 extern crate all_spans_same;
 

tests/ui/parser/attribute/invalid-delimeter-ice-146808.stderr

@@ -1,5 +1,5 @@
 error: wrong meta list delimiters
- --> $DIR/invalid-delimeter-ice-146808.rs:8:1
+ --> $DIR/invalid-delimeter-ice-146808.rs:10:1
  |
 LL | #[all_spans_same::all_spans_same]
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^