diff options
| author | bors <bors@rust-lang.org> | 2022-10-11 04:27:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-11 04:27:13 +0000 |
| commit | 365578445c6771bb74bfd341c8c48867164a9992 (patch) | |
| tree | ae2b6f003c64e56bf891657a33d76ecac04ba767 /src/test/codegen | |
| parent | 518263d889818d16a09a8260f212f8ff4bf345f1 (diff) | |
| parent | 5f3a4240c5ea5a5943eca5a467e3be04159e89a4 (diff) | |
| download | rust-365578445c6771bb74bfd341c8c48867164a9992.tar.gz rust-365578445c6771bb74bfd341c8c48867164a9992.zip | |
Auto merge of #102724 - pcc:scs-fix-test, r=Mark-Simulacrum
Fix the sanitizer_scs_attr_check.rs test The test is failing when targeting aarch64 Android. The intent appears to have been to look for a function attributes comment (or the absence of one) on the line preceding the function declaration. But this isn't quite possible with FileCheck and the test as written was looking for a line with `no_scs` after a line with `scs`, which doesn't appear in the output. Instead, match on the function attributes comment on the line following the demangled function name comment.
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/sanitizer_scs_attr_check.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/codegen/sanitizer_scs_attr_check.rs b/src/test/codegen/sanitizer_scs_attr_check.rs index 0b53db3b767..a885d911717 100644 --- a/src/test/codegen/sanitizer_scs_attr_check.rs +++ b/src/test/codegen/sanitizer_scs_attr_check.rs @@ -7,11 +7,11 @@ #![crate_type = "lib"] #![feature(no_sanitize)] -// CHECK: ; Function Attrs:{{.*}}shadowcallstack -// CHECK-NEXT: scs +// CHECK: ; sanitizer_scs_attr_check::scs +// CHECK-NEXT: ; Function Attrs:{{.*}}shadowcallstack pub fn scs() {} +// CHECK: ; sanitizer_scs_attr_check::no_scs // CHECK-NOT: ; Function Attrs:{{.*}}shadowcallstack -// CHECK-NEXT: no_scs #[no_sanitize(shadow_call_stack)] pub fn no_scs() {} |