summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/test/clang-tidy
diff options
context:
space:
mode:
Diffstat (limited to 'clang-tools-extra/test/clang-tidy')
-rwxr-xr-xclang-tools-extra/test/clang-tidy/check_clang_tidy_fix.sh3
-rw-r--r--clang-tools-extra/test/clang-tidy/llvm-twine-local.cpp12
2 files changed, 7 insertions, 8 deletions
diff --git a/clang-tools-extra/test/clang-tidy/check_clang_tidy_fix.sh b/clang-tools-extra/test/clang-tidy/check_clang_tidy_fix.sh
index c272db39292..6ec73e222ce 100755
--- a/clang-tools-extra/test/clang-tidy/check_clang_tidy_fix.sh
+++ b/clang-tools-extra/test/clang-tidy/check_clang_tidy_fix.sh
@@ -7,5 +7,6 @@ CHECK_TO_RUN=$2
TEMPORARY_FILE=$3.cpp
grep -Ev "// *[A-Z-]+:" ${INPUT_FILE} > ${TEMPORARY_FILE}
-clang-tidy ${TEMPORARY_FILE} -fix --checks="-*,${CHECK_TO_RUN}" -- --std=c++11
+clang-tidy ${TEMPORARY_FILE} -fix --checks="-*,${CHECK_TO_RUN}" -- --std=c++11 > ${TEMPORARY_FILE}.msg 2>&1
FileCheck -input-file=${TEMPORARY_FILE} ${INPUT_FILE} -strict-whitespace
+not grep CHECK-MESSAGES ${INPUT_FILE} || FileCheck -input-file=${TEMPORARY_FILE}.msg ${INPUT_FILE} -check-prefix=CHECK-MESSAGES
diff --git a/clang-tools-extra/test/clang-tidy/llvm-twine-local.cpp b/clang-tools-extra/test/clang-tidy/llvm-twine-local.cpp
index 0f134a5500a..dc8f8f0cb07 100644
--- a/clang-tools-extra/test/clang-tidy/llvm-twine-local.cpp
+++ b/clang-tools-extra/test/clang-tidy/llvm-twine-local.cpp
@@ -1,7 +1,5 @@
-// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: clang-tidy %t.cpp -checks='-*,llvm-twine-local' -fix -- > %t.msg 2>&1
-// RUN: FileCheck -input-file=%t.cpp %s
-// RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s
+// RUN: $(dirname %s)/check_clang_tidy_fix.sh %s llvm-twine-local %t
+// REQUIRES: shell
namespace llvm {
class Twine {
@@ -17,19 +15,19 @@ using namespace llvm;
void foo(const Twine &x);
static Twine Moo = Twine("bark") + "bah";
-// CHECK-MASSAGES: twine variables are prone to use after free bugs
+// CHECK-MASSAGES: twine variables are prone to use-after-free bugs
// CHECK-MESSAGES: note: FIX-IT applied suggested code changes
// CHECK: static std::string Moo = (Twine("bark") + "bah").str();
int main() {
const Twine t = Twine("a") + "b" + Twine(42);
-// CHECK-MASSAGES: twine variables are prone to use after free bugs
+// CHECK-MASSAGES: twine variables are prone to use-after-free bugs
// CHECK-MESSAGES: note: FIX-IT applied suggested code changes
// CHECK: std::string t = (Twine("a") + "b" + Twine(42)).str();
foo(Twine("a") + "b");
Twine Prefix = false ? "__INT_FAST" : "__UINT_FAST";
-// CHECK-MASSAGES: twine variables are prone to use after free bugs
+// CHECK-MASSAGES: twine variables are prone to use-after-free bugs
// CHECK-MESSAGES: note: FIX-IT applied suggested code changes
// CHECK: const char * Prefix = false ? "__INT_FAST" : "__UINT_FAST";
}
OpenPOWER on IntegriCloud