Skip to content

Commit 622d589

Browse files
committed
Rename directive needs-profiler-support to needs-profiler-runtime
1 parent 4203c68 commit 622d589

File tree

16 files changed

+18
-18
lines changed

16 files changed

+18
-18
lines changed

Diff for: src/tools/compiletest/src/command-list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
129129
"needs-git-hash",
130130
"needs-llvm-components",
131131
"needs-llvm-zstd",
132-
"needs-profiler-support",
132+
"needs-profiler-runtime",
133133
"needs-relocation-model-pic",
134134
"needs-run-enabled",
135135
"needs-rust-lld",

Diff for: src/tools/compiletest/src/common.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ pub struct Config {
385385
pub git_merge_commit_email: String,
386386

387387
/// True if the profiler runtime is enabled for this target.
388-
/// Used by the "needs-profiler-support" header in test files.
388+
/// Used by the "needs-profiler-runtime" directive in test files.
389389
pub profiler_support: bool,
390390
}
391391

Diff for: src/tools/compiletest/src/header.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ fn iter_header(
851851
// FIXME(jieyouxu): I feel like there's a better way to do this, leaving for later.
852852
if mode == Mode::CoverageRun {
853853
let extra_directives: &[&str] = &[
854-
"needs-profiler-support",
854+
"needs-profiler-runtime",
855855
// FIXME(pietroalbini): this test currently does not work on cross-compiled targets
856856
// because remote-test is not capable of sending back the *.profraw files generated by
857857
// the LLVM instrumentation.

Diff for: src/tools/compiletest/src/header/needs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ pub(super) fn handle_needs(
100100
ignore_reason: "ignored on targets without unwinding support",
101101
},
102102
Need {
103-
name: "needs-profiler-support",
103+
name: "needs-profiler-runtime",
104104
condition: cache.profiler_support,
105-
ignore_reason: "ignored when profiler support is disabled",
105+
ignore_reason: "ignored when the profiler runtime is not available",
106106
},
107107
Need {
108108
name: "needs-force-clang-based-tests",

Diff for: src/tools/compiletest/src/header/tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -370,10 +370,10 @@ fn sanitizers() {
370370
#[test]
371371
fn profiler_support() {
372372
let config: Config = cfg().profiler_support(false).build();
373-
assert!(check_ignore(&config, "//@ needs-profiler-support"));
373+
assert!(check_ignore(&config, "//@ needs-profiler-runtime"));
374374

375375
let config: Config = cfg().profiler_support(true).build();
376-
assert!(!check_ignore(&config, "//@ needs-profiler-support"));
376+
assert!(!check_ignore(&config, "//@ needs-profiler-runtime"));
377377
}
378378

379379
#[test]

Diff for: tests/run-make/cross-lang-lto-pgo-smoketest-clang/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// RUSTBUILD_FORCE_CLANG_BASED_TESTS and only runs tests which contain "clang" in their
1010
// name.
1111

12-
//@ needs-profiler-support
12+
//@ needs-profiler-runtime
1313
// FIXME(Oneirical): Except that due to the reliance on llvm-profdata, this test
1414
// never runs, because `x86_64-gnu-debug` does not have the `profiler_builtins` crate.
1515

Diff for: tests/run-make/optimization-remarks-dir-pgo/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// the output remark files.
55
// See https://github.com/rust-lang/rust/pull/114439
66

7-
//@ needs-profiler-support
7+
//@ needs-profiler-runtime
88
//@ ignore-cross-compile
99

1010
use run_make_support::{

Diff for: tests/run-make/pgo-branch-weights/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// If the test passes, the expected function call count was added to the use-phase LLVM-IR.
88
// See https://github.com/rust-lang/rust/pull/66631
99

10-
//@ needs-profiler-support
10+
//@ needs-profiler-runtime
1111
//@ ignore-cross-compile
1212

1313
use std::path::Path;

Diff for: tests/run-make/pgo-gen-lto/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// should be generated.
33
// See https://github.com/rust-lang/rust/pull/48346
44

5-
//@ needs-profiler-support
5+
//@ needs-profiler-runtime
66
// Reason: this exercises LTO profiling
77
//@ ignore-cross-compile
88
// Reason: the compiled binary is executed

Diff for: tests/run-make/pgo-gen/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// optimizes code. This test checks that these files are generated.
44
// See https://github.com/rust-lang/rust/pull/48346
55

6-
//@ needs-profiler-support
6+
//@ needs-profiler-runtime
77
//@ ignore-cross-compile
88

99
use run_make_support::{cwd, has_extension, has_prefix, run, rustc, shallow_find_files};

Diff for: tests/run-make/pgo-indirect-call-promotion/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// whether it can make a direct call instead of the indirect call.
66
// See https://github.com/rust-lang/rust/pull/66631
77

8-
//@ needs-profiler-support
8+
//@ needs-profiler-runtime
99
// Reason: llvm_profdata is used
1010
//@ ignore-cross-compile
1111
// Reason: the compiled binary is executed

Diff for: tests/run-make/pgo-use/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// be marked as cold.
66
// See https://github.com/rust-lang/rust/pull/60262
77

8-
//@ needs-profiler-support
8+
//@ needs-profiler-runtime
99
//@ ignore-cross-compile
1010

1111
use run_make_support::{

Diff for: tests/run-make/profile/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// See https://github.com/rust-lang/rust/pull/42433
77

88
//@ ignore-cross-compile
9-
//@ needs-profiler-support
9+
//@ needs-profiler-runtime
1010

1111
use run_make_support::{path, run, rustc};
1212

Diff for: tests/run-make/track-pgo-dep-info/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
//@ ignore-cross-compile
88
// Reason: the binary is executed
9-
//@ needs-profiler-support
9+
//@ needs-profiler-runtime
1010

1111
use run_make_support::{llvm_profdata, rfs, run, rustc};
1212

Diff for: tests/ui/coverage-attr/bad-attr-ice.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![cfg_attr(feat, feature(coverage_attribute))]
22
//@ revisions: feat nofeat
33
//@ compile-flags: -Cinstrument-coverage
4-
//@ needs-profiler-support
4+
//@ needs-profiler-runtime
55

66
// Malformed `#[coverage(..)]` attributes should not cause an ICE when built
77
// with `-Cinstrument-coverage`.

Diff for: tests/ui/issues/issue-85461.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ compile-flags: -Cinstrument-coverage -Ccodegen-units=4 --crate-type dylib -Copt-level=0
22
//@ build-pass
3-
//@ needs-profiler-support
3+
//@ needs-profiler-runtime
44
//@ needs-dynamic-linking
55

66
// Regression test for #85461 where MSVC sometimes fails to link instrument-coverage binaries

0 commit comments

Comments
 (0)