From f81bc3f2d174ac21e576cdddb736524531258fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 19 Mar 2018 20:55:47 +0100 Subject: [PATCH 2/2] [test] Fix Cross-DSO CFI Android sanitizer test for -rtlib=compiler-rt Fix the CHECK-CFI-CROSS-DSO-ANDROID test to be more precise and match specifically 'clang_rt.cfi' rather than any compiler-rt library. This fixes the failure when the linker command-line contains clang_rt.builtins library due to CLANG_DEFAULT_RTLIB=compiler-rt. --- test/Driver/sanitizer-ld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c index 0da4255f69..9309450186 100644 --- a/test/Driver/sanitizer-ld.c +++ b/test/Driver/sanitizer-ld.c @@ -514,7 +514,7 @@ // RUN: --sysroot=%S/Inputs/basic_android_tree \ // RUN: | FileCheck --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID %s // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}" -// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt. +// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.cfi // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime. // RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso %s -### -o %t.o 2>&1 \ -- 2.16.2