diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2016-02-24 00:16:57 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2016-02-24 00:16:57 +0000 |
| commit | 41172a304aecf8733335fe90387df10267ab8136 (patch) | |
| tree | 5f18b870faf5e0bbb7edd9c012189630a6e8c7d8 | |
| parent | 75b4ae25cb3ba24ddbbec9780dcdd15df022b6cc (diff) | |
| download | bcm5719-llvm-41172a304aecf8733335fe90387df10267ab8136.tar.gz bcm5719-llvm-41172a304aecf8733335fe90387df10267ab8136.zip | |
[tests] Don't compile CFI C tests in C++ mode.
llvm-svn: 261708
| -rw-r--r-- | compiler-rt/test/cfi/icall/bad-signature.c | 8 | ||||
| -rw-r--r-- | compiler-rt/test/cfi/icall/external-call.c | 2 | ||||
| -rw-r--r-- | compiler-rt/test/cfi/lit.cfg | 10 |
3 files changed, 13 insertions, 7 deletions
diff --git a/compiler-rt/test/cfi/icall/bad-signature.c b/compiler-rt/test/cfi/icall/bad-signature.c index 43de1178fe6..183e62738bb 100644 --- a/compiler-rt/test/cfi/icall/bad-signature.c +++ b/compiler-rt/test/cfi/icall/bad-signature.c @@ -1,10 +1,10 @@ -// RUN: %clangxx -o %t1 %s +// RUN: %clang -o %t1 %s // RUN: %t1 2>&1 | FileCheck --check-prefix=NCFI %s -// RUN: %clangxx_cfi -o %t2 %s +// RUN: %clang_cfi -o %t2 %s // RUN: %expect_crash %t2 2>&1 | FileCheck --check-prefix=CFI %s -// RUN: %clangxx_cfi_diag -g -o %t3 %s +// RUN: %clang_cfi_diag -g -o %t3 %s // RUN: %t3 2>&1 | FileCheck --check-prefix=CFI-DIAG %s #include <stdio.h> @@ -18,7 +18,7 @@ int main() { fprintf(stderr, "1\n"); // CFI-DIAG: runtime error: control flow integrity check for type 'void (int)' failed during indirect function call - // CFI-DIAG: f() defined here + // CFI-DIAG: f defined here ((void (*)(int))f)(42); // UB here // CFI-NOT: 2 diff --git a/compiler-rt/test/cfi/icall/external-call.c b/compiler-rt/test/cfi/icall/external-call.c index 43fc2520756..e90c7e042c2 100644 --- a/compiler-rt/test/cfi/icall/external-call.c +++ b/compiler-rt/test/cfi/icall/external-call.c @@ -1,4 +1,4 @@ -// RUN: %clangxx_cfi -o %t1 %s +// RUN: %clang_cfi -lm -o %t1 %s // RUN: %t1 c 1 2>&1 | FileCheck --check-prefix=CFI %s // RUN: %t1 s 2 2>&1 | FileCheck --check-prefix=CFI %s diff --git a/compiler-rt/test/cfi/lit.cfg b/compiler-rt/test/cfi/lit.cfg index 687c80f4f08..da210c6259c 100644 --- a/compiler-rt/test/cfi/lit.cfg +++ b/compiler-rt/test/cfi/lit.cfg @@ -7,11 +7,17 @@ config.test_source_root = os.path.dirname(__file__) clangxx = ' '.join([config.clang] + config.cxx_mode_flags) +config.substitutions.append((r"%clang ", ' '.join([config.clang]) + ' ')) config.substitutions.append((r"%clangxx ", clangxx + ' ')) if config.lto_supported: - clangxx_cfi = ' '.join(config.lto_launch + [clangxx] + config.lto_flags + ['-flto -fsanitize=cfi ']) - clangxx_cfi_diag = clangxx_cfi + '-fno-sanitize-trap=cfi -fsanitize-recover=cfi ' + clang_cfi = ' '.join(config.lto_launch + [config.clang] + config.lto_flags + ['-flto -fsanitize=cfi ']) + clangxx_cfi = clang_cfi + ' '.join(config.cxx_mode_flags) + ' ' + diag_flags = '-fno-sanitize-trap=cfi -fsanitize-recover=cfi ' + clang_cfi_diag = clang_cfi + diag_flags + clangxx_cfi_diag = clangxx_cfi + diag_flags + config.substitutions.append((r"%clang_cfi ", clang_cfi)) config.substitutions.append((r"%clangxx_cfi ", clangxx_cfi)) + config.substitutions.append((r"%clang_cfi_diag ", clang_cfi_diag)) config.substitutions.append((r"%clangxx_cfi_diag ", clangxx_cfi_diag)) config.substitutions.append((r"%clangxx_cfi_dso ", clangxx_cfi + '-fsanitize-cfi-cross-dso ')) config.substitutions.append((r"%clangxx_cfi_dso_diag ", clangxx_cfi_diag + '-fsanitize-cfi-cross-dso ')) |
