From 49d29ed950f9e309a7b755b2a0601ed483ce3ade Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Sun, 20 Oct 2013 21:29:32 +0000 Subject: [ubsan] Introduce %clangxx substitution for all C++ tests. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@193059 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ubsan/lit_tests/Float/cast-overflow.cpp | 2 +- lib/ubsan/lit_tests/Integer/add-overflow.cpp | 6 +++--- lib/ubsan/lit_tests/Integer/div-overflow.cpp | 2 +- lib/ubsan/lit_tests/Integer/div-zero.cpp | 8 ++++---- lib/ubsan/lit_tests/Integer/incdec-overflow.cpp | 8 ++++---- lib/ubsan/lit_tests/Integer/mul-overflow.cpp | 2 +- lib/ubsan/lit_tests/Integer/negate-overflow.cpp | 4 ++-- lib/ubsan/lit_tests/Integer/no-recover.cpp | 6 +++--- lib/ubsan/lit_tests/Integer/shift.cpp | 20 ++++++++++---------- lib/ubsan/lit_tests/Integer/sub-overflow.cpp | 6 +++--- lib/ubsan/lit_tests/Integer/uadd-overflow.cpp | 6 +++--- lib/ubsan/lit_tests/Integer/uincdec-overflow.cpp | 8 ++++---- lib/ubsan/lit_tests/Integer/umul-overflow.cpp | 2 +- lib/ubsan/lit_tests/Integer/usub-overflow.cpp | 6 +++--- lib/ubsan/lit_tests/Misc/bool.cpp | 2 +- lib/ubsan/lit_tests/Misc/bounds.cpp | 2 +- lib/ubsan/lit_tests/Misc/deduplication.cpp | 2 +- lib/ubsan/lit_tests/Misc/enum.cpp | 6 +++--- lib/ubsan/lit_tests/Misc/missing_return.cpp | 2 +- lib/ubsan/lit_tests/Misc/unreachable.cpp | 2 +- lib/ubsan/lit_tests/TypeCheck/misaligned.cpp | 2 +- lib/ubsan/lit_tests/TypeCheck/null.cpp | 2 +- lib/ubsan/lit_tests/TypeCheck/vptr.cpp | 2 +- lib/ubsan/lit_tests/lit.cfg | 4 +++- 24 files changed, 57 insertions(+), 55 deletions(-) diff --git a/lib/ubsan/lit_tests/Float/cast-overflow.cpp b/lib/ubsan/lit_tests/Float/cast-overflow.cpp index 8d9120d5..35f9336c 100644 --- a/lib/ubsan/lit_tests/Float/cast-overflow.cpp +++ b/lib/ubsan/lit_tests/Float/cast-overflow.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=float-cast-overflow %s -o %t +// RUN: %clangxx -fsanitize=float-cast-overflow %s -o %t // RUN: %t _ // RUN: %t 0 2>&1 | FileCheck %s --check-prefix=CHECK-0 // RUN: %t 1 2>&1 | FileCheck %s --check-prefix=CHECK-1 diff --git a/lib/ubsan/lit_tests/Integer/add-overflow.cpp b/lib/ubsan/lit_tests/Integer/add-overflow.cpp index 2072dc44..412eb762 100644 --- a/lib/ubsan/lit_tests/Integer/add-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/add-overflow.cpp @@ -1,6 +1,6 @@ -// RUN: %clang -DADD_I32 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I32 -// RUN: %clang -DADD_I64 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I64 -// RUN: %clang -DADD_I128 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I128 +// RUN: %clangxx -DADD_I32 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I32 +// RUN: %clangxx -DADD_I64 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I64 +// RUN: %clangxx -DADD_I128 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I128 #include #include diff --git a/lib/ubsan/lit_tests/Integer/div-overflow.cpp b/lib/ubsan/lit_tests/Integer/div-overflow.cpp index dd82427f..83aa8544 100644 --- a/lib/ubsan/lit_tests/Integer/div-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/div-overflow.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s #include diff --git a/lib/ubsan/lit_tests/Integer/div-zero.cpp b/lib/ubsan/lit_tests/Integer/div-zero.cpp index b2a83956..6b8aadfe 100644 --- a/lib/ubsan/lit_tests/Integer/div-zero.cpp +++ b/lib/ubsan/lit_tests/Integer/div-zero.cpp @@ -1,7 +1,7 @@ -// RUN: %clang -fsanitize=integer-divide-by-zero -DDIVIDEND=0 %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clang -fsanitize=integer-divide-by-zero -DDIVIDEND=1U %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clang -fsanitize=float-divide-by-zero -DDIVIDEND=1.5 %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clang -fsanitize=integer-divide-by-zero -DDIVIDEND='intmax(123)' %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=integer-divide-by-zero -DDIVIDEND=0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=integer-divide-by-zero -DDIVIDEND=1U %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=float-divide-by-zero -DDIVIDEND=1.5 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=integer-divide-by-zero -DDIVIDEND='intmax(123)' %s -o %t && %t 2>&1 | FileCheck %s #ifdef __SIZEOF_INT128__ typedef __int128 intmax; diff --git a/lib/ubsan/lit_tests/Integer/incdec-overflow.cpp b/lib/ubsan/lit_tests/Integer/incdec-overflow.cpp index 48b68b63..904250a7 100644 --- a/lib/ubsan/lit_tests/Integer/incdec-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/incdec-overflow.cpp @@ -1,7 +1,7 @@ -// RUN: %clang -DOP=n++ -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clang -DOP=++n -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clang -DOP=m-- -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clang -DOP=--m -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -DOP=n++ -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -DOP=++n -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -DOP=m-- -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -DOP=--m -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s #include diff --git a/lib/ubsan/lit_tests/Integer/mul-overflow.cpp b/lib/ubsan/lit_tests/Integer/mul-overflow.cpp index 8d1e70d6..1cfe23f5 100644 --- a/lib/ubsan/lit_tests/Integer/mul-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/mul-overflow.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s #include diff --git a/lib/ubsan/lit_tests/Integer/negate-overflow.cpp b/lib/ubsan/lit_tests/Integer/negate-overflow.cpp index 2ee4f101..6bee3eea 100644 --- a/lib/ubsan/lit_tests/Integer/negate-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/negate-overflow.cpp @@ -1,5 +1,5 @@ -// RUN: %clang -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECKS -// RUN: %clang -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECKU +// RUN: %clangxx -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECKS +// RUN: %clangxx -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECKU int main() { // CHECKS-NOT: runtime error diff --git a/lib/ubsan/lit_tests/Integer/no-recover.cpp b/lib/ubsan/lit_tests/Integer/no-recover.cpp index e200feaa..269b464a 100644 --- a/lib/ubsan/lit_tests/Integer/no-recover.cpp +++ b/lib/ubsan/lit_tests/Integer/no-recover.cpp @@ -1,6 +1,6 @@ -// RUN: %clang -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=RECOVER -// RUN: %clang -fsanitize=unsigned-integer-overflow -fsanitize-recover %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=RECOVER -// RUN: %clang -fsanitize=unsigned-integer-overflow -fno-sanitize-recover %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=ABORT +// RUN: %clangxx -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=RECOVER +// RUN: %clangxx -fsanitize=unsigned-integer-overflow -fsanitize-recover %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=RECOVER +// RUN: %clangxx -fsanitize=unsigned-integer-overflow -fno-sanitize-recover %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=ABORT #include diff --git a/lib/ubsan/lit_tests/Integer/shift.cpp b/lib/ubsan/lit_tests/Integer/shift.cpp index 0cdb4546..f35fa1f9 100644 --- a/lib/ubsan/lit_tests/Integer/shift.cpp +++ b/lib/ubsan/lit_tests/Integer/shift.cpp @@ -1,13 +1,13 @@ -// RUN: %clang -DLSH_OVERFLOW -DOP='<<' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-LSH_OVERFLOW -// RUN: %clang -DLSH_OVERFLOW -DOP='<<=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-LSH_OVERFLOW -// RUN: %clang -DTOO_LOW -DOP='<<' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_LOW -// RUN: %clang -DTOO_LOW -DOP='>>' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_LOW -// RUN: %clang -DTOO_LOW -DOP='<<=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_LOW -// RUN: %clang -DTOO_LOW -DOP='>>=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_LOW -// RUN: %clang -DTOO_HIGH -DOP='<<' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_HIGH -// RUN: %clang -DTOO_HIGH -DOP='>>' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_HIGH -// RUN: %clang -DTOO_HIGH -DOP='<<=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_HIGH -// RUN: %clang -DTOO_HIGH -DOP='>>=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_HIGH +// RUN: %clangxx -DLSH_OVERFLOW -DOP='<<' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-LSH_OVERFLOW +// RUN: %clangxx -DLSH_OVERFLOW -DOP='<<=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-LSH_OVERFLOW +// RUN: %clangxx -DTOO_LOW -DOP='<<' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_LOW +// RUN: %clangxx -DTOO_LOW -DOP='>>' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_LOW +// RUN: %clangxx -DTOO_LOW -DOP='<<=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_LOW +// RUN: %clangxx -DTOO_LOW -DOP='>>=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_LOW +// RUN: %clangxx -DTOO_HIGH -DOP='<<' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_HIGH +// RUN: %clangxx -DTOO_HIGH -DOP='>>' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_HIGH +// RUN: %clangxx -DTOO_HIGH -DOP='<<=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_HIGH +// RUN: %clangxx -DTOO_HIGH -DOP='>>=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-TOO_HIGH #include diff --git a/lib/ubsan/lit_tests/Integer/sub-overflow.cpp b/lib/ubsan/lit_tests/Integer/sub-overflow.cpp index 89fbca74..bf33d293 100644 --- a/lib/ubsan/lit_tests/Integer/sub-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/sub-overflow.cpp @@ -1,6 +1,6 @@ -// RUN: %clang -DSUB_I32 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I32 -// RUN: %clang -DSUB_I64 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I64 -// RUN: %clang -DSUB_I128 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I128 +// RUN: %clangxx -DSUB_I32 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I32 +// RUN: %clangxx -DSUB_I64 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I64 +// RUN: %clangxx -DSUB_I128 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I128 #include #include diff --git a/lib/ubsan/lit_tests/Integer/uadd-overflow.cpp b/lib/ubsan/lit_tests/Integer/uadd-overflow.cpp index ff6350cc..d97a642a 100644 --- a/lib/ubsan/lit_tests/Integer/uadd-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/uadd-overflow.cpp @@ -1,6 +1,6 @@ -// RUN: %clang -DADD_I32 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I32 -// RUN: %clang -DADD_I64 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I64 -// RUN: %clang -DADD_I128 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I128 +// RUN: %clangxx -DADD_I32 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I32 +// RUN: %clangxx -DADD_I64 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I64 +// RUN: %clangxx -DADD_I128 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-ADD_I128 #include #include diff --git a/lib/ubsan/lit_tests/Integer/uincdec-overflow.cpp b/lib/ubsan/lit_tests/Integer/uincdec-overflow.cpp index 87e7e360..a14bd6a7 100644 --- a/lib/ubsan/lit_tests/Integer/uincdec-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/uincdec-overflow.cpp @@ -1,7 +1,7 @@ -// RUN: %clang -DOP=n++ -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck --check-prefix=CHECK-INC %s -// RUN: %clang -DOP=++n -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck --check-prefix=CHECK-INC %s -// RUN: %clang -DOP=m-- -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck --check-prefix=CHECK-DEC %s -// RUN: %clang -DOP=--m -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck --check-prefix=CHECK-DEC %s +// RUN: %clangxx -DOP=n++ -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck --check-prefix=CHECK-INC %s +// RUN: %clangxx -DOP=++n -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck --check-prefix=CHECK-INC %s +// RUN: %clangxx -DOP=m-- -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck --check-prefix=CHECK-DEC %s +// RUN: %clangxx -DOP=--m -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck --check-prefix=CHECK-DEC %s #include diff --git a/lib/ubsan/lit_tests/Integer/umul-overflow.cpp b/lib/ubsan/lit_tests/Integer/umul-overflow.cpp index 42cf3a78..c84bb39e 100644 --- a/lib/ubsan/lit_tests/Integer/umul-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/umul-overflow.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s #include diff --git a/lib/ubsan/lit_tests/Integer/usub-overflow.cpp b/lib/ubsan/lit_tests/Integer/usub-overflow.cpp index 1987f193..44621fd8 100644 --- a/lib/ubsan/lit_tests/Integer/usub-overflow.cpp +++ b/lib/ubsan/lit_tests/Integer/usub-overflow.cpp @@ -1,6 +1,6 @@ -// RUN: %clang -DSUB_I32 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I32 -// RUN: %clang -DSUB_I64 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I64 -// RUN: %clang -DSUB_I128 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I128 +// RUN: %clangxx -DSUB_I32 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I32 +// RUN: %clangxx -DSUB_I64 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I64 +// RUN: %clangxx -DSUB_I128 -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUB_I128 #include #include diff --git a/lib/ubsan/lit_tests/Misc/bool.cpp b/lib/ubsan/lit_tests/Misc/bool.cpp index 922d3c92..e916e7fb 100644 --- a/lib/ubsan/lit_tests/Misc/bool.cpp +++ b/lib/ubsan/lit_tests/Misc/bool.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=bool %s -O3 -o %T/bool.exe && %T/bool.exe 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=bool %s -O3 -o %T/bool.exe && %T/bool.exe 2>&1 | FileCheck %s unsigned char NotABool = 123; diff --git a/lib/ubsan/lit_tests/Misc/bounds.cpp b/lib/ubsan/lit_tests/Misc/bounds.cpp index 07b30d38..dc4c4a51 100644 --- a/lib/ubsan/lit_tests/Misc/bounds.cpp +++ b/lib/ubsan/lit_tests/Misc/bounds.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=bounds %s -O3 -o %T/bounds.exe +// RUN: %clangxx -fsanitize=bounds %s -O3 -o %T/bounds.exe // RUN: %T/bounds.exe 0 0 0 // RUN: %T/bounds.exe 1 2 3 // RUN: %T/bounds.exe 2 0 0 2>&1 | FileCheck %s --check-prefix=CHECK-A-2 diff --git a/lib/ubsan/lit_tests/Misc/deduplication.cpp b/lib/ubsan/lit_tests/Misc/deduplication.cpp index d9c909f9..d325bf6d 100644 --- a/lib/ubsan/lit_tests/Misc/deduplication.cpp +++ b/lib/ubsan/lit_tests/Misc/deduplication.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=undefined %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=undefined %s -o %t && %t 2>&1 | FileCheck %s // Verify deduplication works by ensuring only one diag is emitted. #include #include diff --git a/lib/ubsan/lit_tests/Misc/enum.cpp b/lib/ubsan/lit_tests/Misc/enum.cpp index b363fea3..c5642507 100644 --- a/lib/ubsan/lit_tests/Misc/enum.cpp +++ b/lib/ubsan/lit_tests/Misc/enum.cpp @@ -1,6 +1,6 @@ -// RUN: %clang -fsanitize=enum %s -O3 -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-PLAIN -// RUN: %clang -fsanitize=enum -std=c++11 -DE="class E" %s -O3 -o %t && %t -// RUN: %clang -fsanitize=enum -std=c++11 -DE="class E : bool" %s -O3 -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-BOOL +// RUN: %clangxx -fsanitize=enum %s -O3 -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-PLAIN +// RUN: %clangxx -fsanitize=enum -std=c++11 -DE="class E" %s -O3 -o %t && %t +// RUN: %clangxx -fsanitize=enum -std=c++11 -DE="class E : bool" %s -O3 -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-BOOL enum E { a = 1 } e; #undef E diff --git a/lib/ubsan/lit_tests/Misc/missing_return.cpp b/lib/ubsan/lit_tests/Misc/missing_return.cpp index 9997b838..7da238e2 100644 --- a/lib/ubsan/lit_tests/Misc/missing_return.cpp +++ b/lib/ubsan/lit_tests/Misc/missing_return.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=return %s -O3 -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=return %s -O3 -o %t && %t 2>&1 | FileCheck %s // CHECK: missing_return.cpp:4:5: runtime error: execution reached the end of a value-returning function without returning a value int f() { diff --git a/lib/ubsan/lit_tests/Misc/unreachable.cpp b/lib/ubsan/lit_tests/Misc/unreachable.cpp index 5ca4e5fd..75fc3e5b 100644 --- a/lib/ubsan/lit_tests/Misc/unreachable.cpp +++ b/lib/ubsan/lit_tests/Misc/unreachable.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=unreachable %s -O3 -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx -fsanitize=unreachable %s -O3 -o %t && %t 2>&1 | FileCheck %s int main(int, char **argv) { // CHECK: unreachable.cpp:5:3: runtime error: execution reached a __builtin_unreachable() call diff --git a/lib/ubsan/lit_tests/TypeCheck/misaligned.cpp b/lib/ubsan/lit_tests/TypeCheck/misaligned.cpp index e5254982..9b0b9a11 100644 --- a/lib/ubsan/lit_tests/TypeCheck/misaligned.cpp +++ b/lib/ubsan/lit_tests/TypeCheck/misaligned.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=alignment %s -O3 -o %t +// RUN: %clangxx -fsanitize=alignment %s -O3 -o %t // RUN: %t l0 && %t s0 && %t r0 && %t m0 && %t f0 && %t n0 // RUN: %t l1 2>&1 | FileCheck %s --check-prefix=CHECK-LOAD --strict-whitespace // RUN: %t s1 2>&1 | FileCheck %s --check-prefix=CHECK-STORE diff --git a/lib/ubsan/lit_tests/TypeCheck/null.cpp b/lib/ubsan/lit_tests/TypeCheck/null.cpp index f72af28c..79726924 100644 --- a/lib/ubsan/lit_tests/TypeCheck/null.cpp +++ b/lib/ubsan/lit_tests/TypeCheck/null.cpp @@ -1,4 +1,4 @@ -// RUN: %clang -fsanitize=null %s -O3 -o %t +// RUN: %clangxx -fsanitize=null %s -O3 -o %t // RUN: %t l 2>&1 | FileCheck %s --check-prefix=CHECK-LOAD // RUN: %t s 2>&1 | FileCheck %s --check-prefix=CHECK-STORE // RUN: %t r 2>&1 | FileCheck %s --check-prefix=CHECK-REFERENCE diff --git a/lib/ubsan/lit_tests/TypeCheck/vptr.cpp b/lib/ubsan/lit_tests/TypeCheck/vptr.cpp index 3159f36e..bd7970a9 100644 --- a/lib/ubsan/lit_tests/TypeCheck/vptr.cpp +++ b/lib/ubsan/lit_tests/TypeCheck/vptr.cpp @@ -1,4 +1,4 @@ -// RUN: %clang --driver-mode=g++ -fsanitize=vptr %s -O3 -o %t +// RUN: %clangxx -fsanitize=vptr %s -O3 -o %t // RUN: %t rT && %t mT && %t fT && %t cT // RUN: %t rU && %t mU && %t fU && %t cU // RUN: %t rS && %t rV && %t oV diff --git a/lib/ubsan/lit_tests/lit.cfg b/lib/ubsan/lit_tests/lit.cfg index 6714a56c..4a5bc237 100644 --- a/lib/ubsan/lit_tests/lit.cfg +++ b/lib/ubsan/lit_tests/lit.cfg @@ -49,8 +49,10 @@ if llvm_src_root is None: lit_config.load_config(config, ubsan_site_cfg) raise SystemExit -# Define %clang substitution to use in test RUN lines. +# Define %clang and %clangxx substitutions to use in test RUN lines. config.substitutions.append( ("%clang ", (" " + config.clang + " ")) ) +config.substitutions.append( ("%clangxx ", (" " + config.clang + + " --driver-mode=g++ ")) ) # Default test suffixes. config.suffixes = ['.c', '.cc', '.cpp'] -- cgit v1.2.3