From 5f3a4240c5ea5a5943eca5a467e3be04159e89a4 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Wed, 5 Oct 2022 21:46:44 -0700 Subject: [PATCH] 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. --- src/test/codegen/sanitizer_scs_attr_check.rs | 6 +++--- 1 file 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 0b53db3b767cd..a885d911717fb 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() {}