Skip to content

Commit ba2045e

Browse files
committed
TODO: Add to TEACH BOOTSTRAP
1 parent 6bf047f commit ba2045e

5 files changed

Lines changed: 11 additions & 12 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,10 +3907,10 @@ impl Step for TestHelpers {
39073907
.arg(&so)
39083908
.arg(&src)
39093909
.status()
3910-
.expect("Failed to run pauthtest clang for librust_test_helpers.so");
3910+
.unwrap_or_else(|_| panic!("Failed to run clang for {} toolchain", target.triple));
39113911

39123912
if !status.success() {
3913-
panic!("Linking of pauthtest librust_test_helpers.so failed");
3913+
panic!("Linking of librust_test_helpers.so failed (target: {})", target.triple);
39143914
}
39153915
}
39163916
}

src/bootstrap/src/core/sanity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub struct Finder {
3737
/// when the newly-bumped stage 0 compiler now knows about the formerly-missing targets.
3838
const STAGE0_MISSING_TARGETS: &[&str] = &[
3939
// just a dummy comment so the list doesn't get onelined
40-
"aarch64-unknown-linux-pauthtest", // Stage 0 compiler is not guaranteed to see pauthtest yet.
40+
"aarch64-unknown-linux-pauthtest", // Stage 0 compiler is not guaranteed to see the target yet.
4141
];
4242

4343
/// Minimum version threshold for libstdc++ required when using prebuilt LLVM

tests/run-make/c-link-to-rust-va-list-fn/rmake.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//@ needs-target-std
77
//@ ignore-android: FIXME(#142855)
88
//@ ignore-sgx: (x86 machine code cannot be directly executed)
9-
//@ ignore-aarch64-unknown-linux-pauthtest: (pauthtest requires non-trivial compilation of c
10-
//sources, ignore the test for now).
9+
//@ ignore-aarch64-unknown-linux-pauthtest: (it requires non-trivial compilation of c sources,
10+
// and only supports dynamic linking, ignore the test).
1111

1212
use run_make_support::{cc, extra_c_flags, run, rustc, static_lib_name};
1313

tests/run-make/pauth-quicksort-c-driver/rmake.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// Test compilation flow using custom pauth-enabled toolchain and signing extern "C" function
2-
// pointers used from within rust. Note that in order for the test to work the location of the
3-
// toolchain's sysroot has to be provided via env variable (`PAUTHTEST_SYSROOT`). The test assumes
4-
// that pauthtest-enabled `clang` is available on the path.
5-
// In this test rust is the driver - providing the data and the comparison function; while c -
6-
// provides the implementation of quicksort algorithm and is the user of the data and comparator.
2+
// pointers used from within rust. The test assumes that pointer-authentication-enabled `clang` is
3+
// available on the path. In this test rust is the driver - providing the data and the comparison
4+
// function; while c - provides the implementation of quicksort algorithm and is the user of the
5+
// data and comparator.
76

87
//@ only-aarch64-unknown-linux-pauthtest
98

tests/run-make/pauth-quicksort-rust-driver/rmake.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Test compilation flow using custom pauth-enabled toolchain and signing extern "C" function
2-
// pointers used from within rust. The test assumes that pauthtest-enabled `clang` is available on
3-
// the path.
2+
// pointers used from within rust. The test assumes that pointer-authentication-enabled `clang` is
3+
// available on the path.
44
// In this test rust is the driver - providing the data and the comparison function; while c -
55
// provides the implementation of quicksort algorithm and is the user of the data and comparator.
66

0 commit comments

Comments
 (0)