about summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorZalathar <Zalathar@users.noreply.github.com>2024-10-09 13:51:26 +1100
committerZalathar <Zalathar@users.noreply.github.com>2024-10-09 20:58:27 +1100
commit622d5898c2d825028ff2703fa46a140c175d5fbf (patch)
tree1bced3b9fc80f8b0349aa6b618e021d7c70aef67 /src/tools/compiletest
parent4203c686136428ab10e2765a00886b7c2909a477 (diff)
downloadrust-622d5898c2d825028ff2703fa46a140c175d5fbf.tar.gz
rust-622d5898c2d825028ff2703fa46a140c175d5fbf.zip
Rename directive `needs-profiler-support` to `needs-profiler-runtime`
Diffstat (limited to 'src/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/command-list.rs2
-rw-r--r--src/tools/compiletest/src/common.rs2
-rw-r--r--src/tools/compiletest/src/header.rs2
-rw-r--r--src/tools/compiletest/src/header/needs.rs4
-rw-r--r--src/tools/compiletest/src/header/tests.rs4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/compiletest/src/command-list.rs b/src/tools/compiletest/src/command-list.rs
index b34c276ab19..53db55d0c10 100644
--- a/src/tools/compiletest/src/command-list.rs
+++ b/src/tools/compiletest/src/command-list.rs
@@ -129,7 +129,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
     "needs-git-hash",
     "needs-llvm-components",
     "needs-llvm-zstd",
-    "needs-profiler-support",
+    "needs-profiler-runtime",
     "needs-relocation-model-pic",
     "needs-run-enabled",
     "needs-rust-lld",
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
index 17ec6ea4301..37f8a3df82e 100644
--- a/src/tools/compiletest/src/common.rs
+++ b/src/tools/compiletest/src/common.rs
@@ -385,7 +385,7 @@ pub struct Config {
     pub git_merge_commit_email: String,
 
     /// True if the profiler runtime is enabled for this target.
-    /// Used by the "needs-profiler-support" header in test files.
+    /// Used by the "needs-profiler-runtime" directive in test files.
     pub profiler_support: bool,
 }
 
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index a6830a6aa17..bd0ed6321bc 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -851,7 +851,7 @@ fn iter_header(
     // FIXME(jieyouxu): I feel like there's a better way to do this, leaving for later.
     if mode == Mode::CoverageRun {
         let extra_directives: &[&str] = &[
-            "needs-profiler-support",
+            "needs-profiler-runtime",
             // FIXME(pietroalbini): this test currently does not work on cross-compiled targets
             // because remote-test is not capable of sending back the *.profraw files generated by
             // the LLVM instrumentation.
diff --git a/src/tools/compiletest/src/header/needs.rs b/src/tools/compiletest/src/header/needs.rs
index f5dd722ed37..ca7600d4dcb 100644
--- a/src/tools/compiletest/src/header/needs.rs
+++ b/src/tools/compiletest/src/header/needs.rs
@@ -100,9 +100,9 @@ pub(super) fn handle_needs(
             ignore_reason: "ignored on targets without unwinding support",
         },
         Need {
-            name: "needs-profiler-support",
+            name: "needs-profiler-runtime",
             condition: cache.profiler_support,
-            ignore_reason: "ignored when profiler support is disabled",
+            ignore_reason: "ignored when the profiler runtime is not available",
         },
         Need {
             name: "needs-force-clang-based-tests",
diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs
index 18e26635ac0..9b1294ad5fe 100644
--- a/src/tools/compiletest/src/header/tests.rs
+++ b/src/tools/compiletest/src/header/tests.rs
@@ -370,10 +370,10 @@ fn sanitizers() {
 #[test]
 fn profiler_support() {
     let config: Config = cfg().profiler_support(false).build();
-    assert!(check_ignore(&config, "//@ needs-profiler-support"));
+    assert!(check_ignore(&config, "//@ needs-profiler-runtime"));
 
     let config: Config = cfg().profiler_support(true).build();
-    assert!(!check_ignore(&config, "//@ needs-profiler-support"));
+    assert!(!check_ignore(&config, "//@ needs-profiler-runtime"));
 }
 
 #[test]