summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2017-06-30 13:23:24 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2017-06-30 13:23:24 +0000
commite6f88b28d39ac839b7a7a9ddd3aa942a89891666 (patch)
treeeb1238df32ac3917dbc567a65b87e858deedcf2c
parentcdfb024e2f69e1466479278579623167799bca5f (diff)
Revert "Modify test so that it looks for patterns in stderr as well"
This reverts commit r303735. No longer needed after r306822 sends the diagnostics to the proper output again. git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@306823 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/clang-tidy/diagnostic.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/clang-tidy/diagnostic.cpp b/test/clang-tidy/diagnostic.cpp
index 9c30b141..9d2fb5c4 100644
--- a/test/clang-tidy/diagnostic.cpp
+++ b/test/clang-tidy/diagnostic.cpp
@@ -1,11 +1,11 @@
// RUN: clang-tidy -checks='-*,modernize-use-override' %s.nonexistent.cpp -- | FileCheck -check-prefix=CHECK1 -implicit-check-not='{{warning:|error:}}' %s
-// RUN: clang-tidy -checks='-*,clang-diagnostic-*,google-explicit-constructor' %s -- -fan-unknown-option 2>&1 | FileCheck -check-prefix=CHECK2 -implicit-check-not='{{warning:|error:}}' %s
-// RUN: clang-tidy -checks='-*,google-explicit-constructor,clang-diagnostic-literal-conversion' %s -- -fan-unknown-option 2>&1 | FileCheck -check-prefix=CHECK3 -implicit-check-not='{{warning:|error:}}' %s
+// RUN: clang-tidy -checks='-*,clang-diagnostic-*,google-explicit-constructor' %s -- -fan-unknown-option | FileCheck -check-prefix=CHECK2 -implicit-check-not='{{warning:|error:}}' %s
+// RUN: clang-tidy -checks='-*,google-explicit-constructor,clang-diagnostic-literal-conversion' %s -- -fan-unknown-option | FileCheck -check-prefix=CHECK3 -implicit-check-not='{{warning:|error:}}' %s
// RUN: clang-tidy -checks='-*,modernize-use-override,clang-diagnostic-macro-redefined' %s -- -DMACRO_FROM_COMMAND_LINE | FileCheck -check-prefix=CHECK4 -implicit-check-not='{{warning:|error:}}' %s
// CHECK1: error: error reading '{{.*}}.nonexistent.cpp' [clang-diagnostic-error]
-// CHECK2: error: unknown argument: '-fan-unknown-option'
-// CHECK3: error: unknown argument: '-fan-unknown-option'
+// CHECK2: error: unknown argument: '-fan-unknown-option' [clang-diagnostic-error]
+// CHECK3: error: unknown argument: '-fan-unknown-option' [clang-diagnostic-error]
// CHECK2: :[[@LINE+2]]:9: warning: implicit conversion from 'double' to 'int' changes value from 1.5 to 1 [clang-diagnostic-literal-conversion]
// CHECK3: :[[@LINE+1]]:9: warning: implicit conversion from 'double' to 'int' changes value