compiletest: add {ignore,needs}-{rustc,std}-debug-assertions directive support

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

Author: jieyouxu

src/tools/compiletest/src/common.rs

@@ -236,8 +236,11 @@ pub struct Config {
 /// Run ignored tests
 pubrun_ignored:bool,
 
-/// Whether to run tests with `ignore-debug` header
-pubwith_debug_assertions:bool,
+/// Whether rustc was built with debug assertions.
+pubwith_rustc_debug_assertions:bool,
+
+/// Whether std was built with debug assertions.
+pubwith_std_debug_assertions:bool,
 
 /// Only run tests that match these filters
 pubfilters:Vec<String>,

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

@@ -45,7 +45,6 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
 "ignore-coverage-map",
 "ignore-coverage-run",
 "ignore-cross-compile",
-"ignore-debug",
 "ignore-eabi",
 "ignore-emscripten",
 "ignore-endian-big",
@@ -81,13 +80,15 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
 "ignore-powerpc",
 "ignore-remote",
 "ignore-riscv64",
+"ignore-rustc-debug-assertions",
 "ignore-s390x",
 "ignore-sgx",
 "ignore-sparc64",
 "ignore-spirv",
 "ignore-stable",
 "ignore-stage1",
 "ignore-stage2",
+"ignore-std-debug-assertions",
 "ignore-test",
 "ignore-thumb",
 "ignore-thumbv8m.base-none-eabi",
@@ -134,6 +135,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
 "needs-relocation-model-pic",
 "needs-run-enabled",
 "needs-rust-lld",
+"needs-rustc-debug-assertions",
 "needs-sanitizer-address",
 "needs-sanitizer-cfi",
 "needs-sanitizer-dataflow",
@@ -146,6 +148,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
 "needs-sanitizer-shadow-call-stack",
 "needs-sanitizer-support",
 "needs-sanitizer-thread",
+"needs-std-debug-assertions",
 "needs-symlink",
 "needs-threads",
 "needs-unwind",

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:"rustc-debug-assertions",
+ condition: config.with_rustc_debug_assertions,
+ message:"when rustc is built with debug assertions",
+}
+condition!{
+ name:"std-debug-assertions",
+ condition: config.with_std_debug_assertions,
+ 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-rustc-debug-assertions",
+condition: config.with_rustc_debug_assertions,
+ignore_reason:"ignored if rustc wasn't built with debug assertions",
+},
+Need{
+name:"needs-std-debug-assertions",
+condition: config.with_std_debug_assertions,
+ignore_reason:"ignored if std wasn't built with debug assertions",
+},
 ];
 
 let(name, comment) = match ln.split_once([':',' ']){

src/tools/compiletest/src/header/tests.rs

@@ -74,6 +74,8 @@ struct ConfigBuilder {
 git_hash:bool,
 system_llvm:bool,
 profiler_runtime:bool,
+rustc_debug_assertions:bool,
+std_debug_assertions:bool,
 }
 
 implConfigBuilder{
@@ -122,6 +124,16 @@ impl ConfigBuilder {
 self
 }
 
+fnrustc_debug_assertions(&mutself,is_enabled:bool) -> &mutSelf{
+self.rustc_debug_assertions = is_enabled;
+self
+}
+
+fnstd_debug_assertions(&mutself,is_enabled:bool) -> &mutSelf{
+self.std_debug_assertions = is_enabled;
+self
+}
+
 fnbuild(&mutself) -> Config{
 let args = &[
 "compiletest",
@@ -169,6 +181,12 @@ impl ConfigBuilder {
 ifself.profiler_runtime{
  args.push("--profiler-runtime".to_owned());
 }
+ifself.rustc_debug_assertions{
+ args.push("--with-rustc-debug-assertions".to_owned());
+}
+ifself.std_debug_assertions{
+ args.push("--with-std-debug-assertions".to_owned());
+}
 
  args.push("--rustc-path".to_string());
 // This is a subtle/fragile thing. On rust-lang CI, there is no global
@@ -313,6 +331,32 @@ fn only_target() {
 assert!(!check_ignore(&config,"//@ only-64bit"));
 }
 
+#[test]
+fnrustc_debug_assertions(){
+let config:Config = cfg().rustc_debug_assertions(false).build();
+
+assert!(check_ignore(&config,"//@ needs-rustc-debug-assertions"));
+assert!(!check_ignore(&config,"//@ ignore-rustc-debug-assertions"));
+
+let config:Config = cfg().rustc_debug_assertions(true).build();
+
+assert!(!check_ignore(&config,"//@ needs-rustc-debug-assertions"));
+assert!(check_ignore(&config,"//@ ignore-rustc-debug-assertions"));
+}
+
+#[test]
+fnstd_debug_assertions(){
+let config:Config = cfg().std_debug_assertions(false).build();
+
+assert!(check_ignore(&config,"//@ needs-std-debug-assertions"));
+assert!(!check_ignore(&config,"//@ ignore-std-debug-assertions"));
+
+let config:Config = cfg().std_debug_assertions(true).build();
+
+assert!(!check_ignore(&config,"//@ needs-std-debug-assertions"));
+assert!(check_ignore(&config,"//@ ignore-std-debug-assertions"));
+}
+
 #[test]
 fnstage(){
 let config:Config = cfg().stage_id("stage1-x86_64-unknown-linux-gnu").build();

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-rustc-debug-assertions","whether rustc was built with debug assertions")
+.optflag("","with-std-debug-assertions","whether std was built with debug assertions")
 .optmulti(
 "",
 "skip",
@@ -234,7 +235,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_rustc_debug_assertions = matches.opt_present("with-rustc-debug-assertions");
+let with_std_debug_assertions = matches.opt_present("with-std-debug-assertions");
 let mode = matches.opt_str("mode").unwrap().parse().expect("invalid mode");
 let has_html_tidy = if mode == Mode::Rustdoc{
 Command::new("tidy")
@@ -292,7 +294,8 @@ pub fn parse_config(args: Vec<String>) -> Config {
 suite: matches.opt_str("suite").unwrap(),
 debugger:None,
  run_ignored,
- with_debug_assertions,
+ with_rustc_debug_assertions,
+ with_std_debug_assertions,
  filters,
 skip: matches.opt_strs("skip"),
 filter_exact: matches.opt_present("exact"),