Remove valgrind test suite and support from compiletest, bootstrap and opt-dist

src/bootstrap/src/core/build_steps/test.rs

@@ -1394,12 +1394,6 @@ default_test!(Ui { path: "tests/ui", mode: "ui", suite: "ui" });
 
 default_test!(Crashes { path: "tests/crashes", mode: "crashes", suite: "crashes" });
 
-default_test!(RunPassValgrind {
- path: "tests/run-pass-valgrind",
- mode: "run-pass-valgrind",
- suite: "run-pass-valgrind"
-});
-
 default_test!(Codegen { path: "tests/codegen", mode: "codegen", suite: "codegen" });
 
 default_test!(CodegenUnits {

src/bootstrap/src/core/builder.rs

@@ -327,7 +327,6 @@ const PATH_REMAP: &[(&str, &[&str])] = &[
  "tests/mir-opt",
  "tests/pretty",
  "tests/run-make",
- "tests/run-pass-valgrind",
  "tests/rustdoc",
  "tests/rustdoc-gui",
  "tests/rustdoc-js",
@@ -852,7 +851,6 @@ impl<'a> Builder<'a> {
  test::Tidy,
  test::Ui,
  test::Crashes,
- test::RunPassValgrind,
  test::Coverage,
  test::CoverageMap,
  test::CoverageRun,

src/tools/compiletest/src/common.rs

@@ -53,7 +53,6 @@ macro_rules! string_enum {
 string_enum! {
  #[derive(Clone, Copy, PartialEq, Debug)]
  pub enum Mode {
- RunPassValgrind => "run-pass-valgrind",
  Pretty => "pretty",
  DebugInfo => "debuginfo",
  Codegen => "codegen",
@@ -207,13 +206,6 @@ pub struct Config {
  /// Path to LLVM's bin directory.
  pub llvm_bin_dir: Option<PathBuf>,
 
- /// The valgrind path.
- pub valgrind_path: Option<String>,
-
- /// Whether to fail if we can't run run-pass-valgrind tests under valgrind
- /// (or, alternatively, to silently run them like regular run-pass tests).
- pub force_valgrind: bool,
-
  /// The path to the Clang executable to run Clang-based tests with. If
  /// `None` then these tests will be ignored.
  pub run_clang_based_tests_with: Option<String>,

src/tools/compiletest/src/lib.rs

@@ -53,8 +53,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
  .reqopt("", "python", "path to python to use for doc tests", "PATH")
  .optopt("", "jsondocck-path", "path to jsondocck to use for doc tests", "PATH")
  .optopt("", "jsondoclint-path", "path to jsondoclint to use for doc tests", "PATH")
- .optopt("", "valgrind-path", "path to Valgrind executable for Valgrind tests", "PROGRAM")
- .optflag("", "force-valgrind", "fail if Valgrind tests cannot be run under Valgrind")
  .optopt("", "run-clang-based-tests-with", "path to Clang executable", "PATH")
  .optopt("", "llvm-filecheck", "path to LLVM's FileCheck binary", "DIR")
  .reqopt("", "src-base", "directory to scan for test files", "PATH")
@@ -65,7 +63,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
  "",
  "mode",
  "which sort of compile tests to run",
- "run-pass-valgrind | pretty | debug-info | codegen | rustdoc \
+ "pretty | debug-info | codegen | rustdoc \
  | rustdoc-json | codegen-units | incremental | run-make | ui \
  | js-doc-test | mir-opt | assembly | crashes",
  )
@@ -269,8 +267,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
  python: matches.opt_str("python").unwrap(),
  jsondocck_path: matches.opt_str("jsondocck-path"),
  jsondoclint_path: matches.opt_str("jsondoclint-path"),
- valgrind_path: matches.opt_str("valgrind-path"),
- force_valgrind: matches.opt_present("force-valgrind"),
  run_clang_based_tests_with: matches.opt_str("run-clang-based-tests-with"),
  llvm_filecheck: matches.opt_str("llvm-filecheck").map(PathBuf::from),
  llvm_bin_dir: matches.opt_str("llvm-bin-dir").map(PathBuf::from),

src/tools/compiletest/src/main.rs

@@ -18,10 +18,6 @@ fn main() {
 
  let config = Arc::new(parse_config(env::args().collect()));
 
- if config.valgrind_path.is_none() && config.force_valgrind {
- panic!("Can't find Valgrind to run Valgrind tests");
- }
-
  if !config.has_tidy && config.mode == Mode::Rustdoc {
  eprintln!("warning: `tidy` is not installed; diffs will not be generated");
  }

src/tools/compiletest/src/runtest.rs

@@ -20,9 +20,9 @@ use tracing::*;
 use crate::common::{
  Assembly, Codegen, CodegenUnits, CompareMode, Config, CoverageMap, CoverageRun, Crashes,
  DebugInfo, Debugger, FailMode, Incremental, JsDocTest, MirOpt, PassMode, Pretty, RunMake,
- RunPassValgrind, Rustdoc, RustdocJson, TestPaths, UI_EXTENSIONS, UI_FIXED, UI_RUN_STDERR,
- UI_RUN_STDOUT, UI_STDERR, UI_STDOUT, UI_SVG, UI_WINDOWS_SVG, Ui, expected_output_path,
- incremental_dir, output_base_dir, output_base_name, output_testname_unique,
+ Rustdoc, RustdocJson, TestPaths, UI_EXTENSIONS, UI_FIXED, UI_RUN_STDERR, UI_RUN_STDOUT,
+ UI_STDERR, UI_STDOUT, UI_SVG, UI_WINDOWS_SVG, Ui, expected_output_path, incremental_dir,
+ output_base_dir, output_base_name, output_testname_unique,
 };
 use crate::compute_diff::{write_diff, write_filtered_diff};
 use crate::errors::{self, Error, ErrorKind};
@@ -49,7 +49,6 @@ mod run_make;
 mod rustdoc;
 mod rustdoc_json;
 mod ui;
-mod valgrind;
 // tidy-alphabet-end
 
 #[cfg(test)]
@@ -253,7 +252,6 @@ impl<'test> TestCx<'test> {
  self.fatal("cannot use should-ice in a test that is not cfail");
  }
  match self.config.mode {
- RunPassValgrind => self.run_valgrind_test(),
  Pretty => self.run_pretty_test(),
  DebugInfo => self.run_debuginfo_test(),
  Codegen => self.run_codegen_test(),
@@ -1500,8 +1498,7 @@ impl<'test> TestCx<'test> {
  Crashes => {
  set_mir_dump_dir(&mut rustc);
  }
- RunPassValgrind | Pretty | DebugInfo | Rustdoc | RustdocJson | RunMake
- | CodegenUnits | JsDocTest => {
+ Pretty | DebugInfo | Rustdoc | RustdocJson | RunMake | CodegenUnits | JsDocTest => {
  // do not use JSON output
  }
  }
@@ -2651,33 +2648,6 @@ impl<'test> TestCx<'test> {
  }
  }
 
- // FIXME(jieyouxu): `run_rpass_test` is hoisted out here and not in incremental because
- // apparently valgrind test falls back to `run_rpass_test` if valgrind isn't available, which
- // seems highly questionable to me.
- fn run_rpass_test(&self) {
- let emit_metadata = self.should_emit_metadata(self.pass_mode());
- let should_run = self.run_if_enabled();
- let proc_res = self.compile_test(should_run, emit_metadata);
-
- if !proc_res.status.success() {
- self.fatal_proc_rec("compilation failed!", &proc_res);
- }
-
- // FIXME(#41968): Move this check to tidy?
- if !errors::load_errors(&self.testpaths.file, self.revision).is_empty() {
- self.fatal("run-pass tests with expected warnings should be moved to ui/");
- }
-
- if let WillExecute::Disabled = should_run {
- return;
- }
-
- let proc_res = self.exec_compiled_test();
- if !proc_res.status.success() {
- self.fatal_proc_rec("test run failed!", &proc_res);
- }
- }
-
  fn aggressive_rm_rf(&self, path: &Path) -> io::Result<()> {
  for e in path.read_dir()? {
  let entry = e?;

src/tools/compiletest/src/runtest/incremental.rs

@@ -1,10 +1,6 @@
 use super::{TestCx, WillExecute};
 use crate::errors;
 
-// FIXME(jieyouxu): `run_rpass_test` got hoisted out of this because apparently valgrind falls back
-// to `run_rpass_test` if valgrind isn't available, which is questionable, but keeping it for
-// refactoring changes to preserve current behavior.
-
 impl TestCx<'_> {
  pub(super) fn run_incremental_test(&self) {
  // Basic plan for a test incremental/foo/bar.rs:
@@ -73,6 +69,30 @@ impl TestCx<'_> {
  }
  }
 
+ fn run_rpass_test(&self) {
+ let emit_metadata = self.should_emit_metadata(self.pass_mode());
+ let should_run = self.run_if_enabled();
+ let proc_res = self.compile_test(should_run, emit_metadata);
+
+ if !proc_res.status.success() {
+ self.fatal_proc_rec("compilation failed!", &proc_res);
+ }
+
+ // FIXME(#41968): Move this check to tidy?
+ if !errors::load_errors(&self.testpaths.file, self.revision).is_empty() {
+ self.fatal("run-pass tests with expected warnings should be moved to ui/");
+ }
+
+ if let WillExecute::Disabled = should_run {
+ return;
+ }
+
+ let proc_res = self.exec_compiled_test();
+ if !proc_res.status.success() {
+ self.fatal_proc_rec("test run failed!", &proc_res);
+ }
+ }
+
  fn run_cfail_test(&self) {
  let pm = self.pass_mode();
  let proc_res = self.compile_test(WillExecute::No, self.should_emit_metadata(pm));
@@ -115,12 +135,6 @@ impl TestCx<'_> {
 
  let proc_res = self.exec_compiled_test();
 
- // The value our Makefile configures valgrind to return on failure
- const VALGRIND_ERR: i32 = 100;
- if proc_res.status.code() == Some(VALGRIND_ERR) {
- self.fatal_proc_rec("run-fail test isn't valgrind-clean!", &proc_res);
- }
-
  let output_to_check = self.get_output(&proc_res);
  self.check_correct_failure_status(&proc_res);
  self.check_all_error_patterns(&output_to_check, &proc_res, pm);

src/tools/opt-dist/src/tests.rs

@@ -96,7 +96,6 @@ llvm-config = "{llvm_config}"
  "tests/incremental",
  "tests/mir-opt",
  "tests/pretty",
- "tests/run-pass-valgrind",
  "tests/ui",
  "tests/crashes",
  ];