Add {ignore,needs}-debug-assertions-{rustc,std} directive support

And retire the old `only-debug` directive which was ambiguous and only
for std debug assertions.

Author: jieyouxu

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

@@ -1928,9 +1928,13 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
 
         cmd.arg("--json");
 
+        if builder.config.rust_debug_assertions {
+            cmd.arg("--with-debug-assertions-rustc");
+        }
+
         if builder.config.rust_debug_assertions_std {
-            cmd.arg("--with-debug-assertions");
-        };
+            cmd.arg("--with-debug-assertions-std");
+        }
 
         let mut llvm_components_passed = false;
         let mut copts_passed = false;

src/tools/compiletest/src/command-list.rs

@@ -45,7 +45,8 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
     "ignore-coverage-map",
     "ignore-coverage-run",
     "ignore-cross-compile",
-    "ignore-debug",
+    "ignore-debug-assertions-rustc",
+    "ignore-debug-assertions-std",
     "ignore-eabi",
     "ignore-emscripten",
     "ignore-endian-big",
@@ -122,6 +123,8 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
     "min-llvm-version",
     "min-system-llvm-version",
     "needs-asm-support",
+    "needs-debug-assertions-rustc",
+    "needs-debug-assertions-std",
     "needs-deterministic-layouts",
     "needs-dlltool",
     "needs-dynamic-linking",

src/tools/compiletest/src/common.rs

@@ -235,8 +235,11 @@ pub struct Config {
     /// Run ignored tests
     pub run_ignored: bool,
 
-    /// Whether to run tests with `ignore-debug` header
-    pub with_debug_assertions: bool,
+    /// Whether rustc was built with debug assertions.
+    pub with_debug_assertions_rustc: bool,
+
+    /// Whether std was built with debug assertions.
+    pub with_debug_assertions_std: bool,
 
     /// Only run tests that match these filters
     pub filters: Vec<String>,

src/tools/compiletest/src/header/cfg.rs

@@ -202,9 +202,14 @@ pub(super) fn parse_cfg_name_directive<'a>(
         message: "when running tests remotely",
     }
     condition! {
-        name: "debug",
-        condition: config.with_debug_assertions,
-        message: "when running tests with `ignore-debug` header",
+        name: "debug-assertions-rustc",
+        condition: config.with_debug_assertions_rustc,
+        message: "when rustc is built with debug assertions",
+    }
+    condition! {
+        name: "debug-assertions-std",
+        condition: config.with_debug_assertions_std,
+        message: "when std is built with debug assertions",
     }
     condition! {
         name: config.debugger.as_ref().map(|d| d.to_str()),

src/tools/compiletest/src/header/needs.rs

@@ -159,6 +159,16 @@ pub(super) fn handle_needs(
             condition: cache.llvm_zstd,
             ignore_reason: "ignored if LLVM wasn't build with zstd for ELF section compression",
         },
+        Need {
+            name: "needs-debug-assertions-rustc",
+            condition: config.with_debug_assertions_rustc,
+            ignore_reason: "ignored if rustc wasn't built with debug assertions",
+        },
+        Need {
+            name: "needs-debug-assertions-std",
+            condition: config.with_debug_assertions_std,
+            ignore_reason: "ignored if std wasn't built with debug assertions",
+        },
     ];
 
     let (name, comment) = match ln.split_once([':', ' ']) {

src/tools/compiletest/src/lib.rs

@@ -88,7 +88,8 @@ pub fn parse_config(args: Vec<String>) -> Config {
         .optopt("", "run", "whether to execute run-* tests", "auto | always | never")
         .optflag("", "ignored", "run tests marked as ignored")
         .optflag("", "has-enzyme", "run tests that require enzyme")
-        .optflag("", "with-debug-assertions", "whether to run tests with `ignore-debug` header")
+        .optflag("", "with-debug-assertions-rustc", "whether rustc was built with debug assertions")
+        .optflag("", "with-debug-assertions-std", "whether std was built with debug assertions")
         .optmulti(
             "",
             "skip",
@@ -228,7 +229,8 @@ pub fn parse_config(args: Vec<String>) -> Config {
 
     let src_base = opt_path(matches, "src-base");
     let run_ignored = matches.opt_present("ignored");
-    let with_debug_assertions = matches.opt_present("with-debug-assertions");
+    let with_debug_assertions_rustc = matches.opt_present("with-debug-assertions-rustc");
+    let with_debug_assertions_std = matches.opt_present("with-debug-assertions-std");
     let mode = matches.opt_str("mode").unwrap().parse().expect("invalid mode");
     let has_tidy = if mode == Mode::Rustdoc {
         Command::new("tidy")
@@ -286,7 +288,8 @@ pub fn parse_config(args: Vec<String>) -> Config {
         suite: matches.opt_str("suite").unwrap(),
         debugger: None,
         run_ignored,
-        with_debug_assertions,
+        with_debug_assertions_rustc,
+        with_debug_assertions_std,
         filters,
         skip: matches.opt_strs("skip"),
         filter_exact: matches.opt_present("exact"),