9 files changed, 13 insertions, 4 deletions
diff --git a/clang/test/Lexer/clang-keywords.cpp b/clang/test/Lexer/clang-keywords.cpp
index a349b44ade2..3a24dce981a 100644
--- a/clang/test/Lexer/clang-keywords.cpp
+++ b/clang/test/Lexer/clang-keywords.cpp
@@ -1,3 +1,4 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
 __char16_t c16;
 void f(__char32_t) { }
diff --git a/clang/test/Lexer/digraph.c b/clang/test/Lexer/digraph.c
index cf6e4789afa..e940caf44f4 100644
--- a/clang/test/Lexer/digraph.c
+++ b/clang/test/Lexer/digraph.c
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -verify -ffreestanding %s
+// expected-no-diagnostics
 
 %:include <stdint.h>
 
diff --git a/clang/test/Lexer/gnu_keywords.c b/clang/test/Lexer/gnu_keywords.c
index c4bd9b3e59d..10a7d31d203 100644
--- a/clang/test/Lexer/gnu_keywords.c
+++ b/clang/test/Lexer/gnu_keywords.c
@@ -2,6 +2,7 @@
 // RUN: %clang_cc1 -DGNU_KEYWORDS -std=c99 -fgnu-keywords -fsyntax-only -verify %s
 // RUN: %clang_cc1 -std=c99 -fsyntax-only -verify %s
 // RUN: %clang_cc1 -std=gnu89 -fno-gnu-keywords -fsyntax-only -verify %s
+// expected-no-diagnostics
 
 void f() {
 #ifdef GNU_KEYWORDS
diff --git a/clang/test/Lexer/long-long.cpp b/clang/test/Lexer/long-long.cpp
index c3f371d17f0..1a0f37b7ff4 100644
--- a/clang/test/Lexer/long-long.cpp
+++ b/clang/test/Lexer/long-long.cpp
@@ -6,13 +6,15 @@
 
 #if !defined(__cplusplus)
 #  if __STDC_VERSION__ < 199901L
-/* expected-error@19 {{'long long' is an extension when C99 mode is not enabled}} */
+/* expected-error@21 {{'long long' is an extension when C99 mode is not enabled}} */
+#  else
+/* expected-no-diagnostics */
 #  endif
 #else
 #  if __cplusplus < 201103L
-/* expected-error@19 {{'long long' is a C++11 extension}} */
+/* expected-error@21 {{'long long' is a C++11 extension}} */
 #  else
-/* expected-warning@19 {{'long long' is incompatible with C++98}} */
+/* expected-warning@21 {{'long long' is incompatible with C++98}} */
 #  endif
 #endif
 
diff --git a/clang/test/Lexer/msdos-cpm-eof.c b/clang/test/Lexer/msdos-cpm-eof.c
index 9ef6e32ea0b..3469b59d408 100644
--- a/clang/test/Lexer/msdos-cpm-eof.c
+++ b/clang/test/Lexer/msdos-cpm-eof.c
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s
+// expected-no-diagnostics
 
 int x; 
 
diff --git a/clang/test/Lexer/newline-eof-c++11.cpp b/clang/test/Lexer/newline-eof-c++11.cpp
index 3c45f28336f..eeabe8bb9fc 100644
--- a/clang/test/Lexer/newline-eof-c++11.cpp
+++ b/clang/test/Lexer/newline-eof-c++11.cpp
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -std=c++11 -Wnewline-eof -verify %s
+// expected-no-diagnostics
 
 // The following line isn't terminated, don't fix it.
 void foo() {}
 \ No newline at end of file
diff --git a/clang/test/Lexer/numeric-literal-trash.c b/clang/test/Lexer/numeric-literal-trash.c
index 5407ba9824f..60981feee16 100644
--- a/clang/test/Lexer/numeric-literal-trash.c
+++ b/clang/test/Lexer/numeric-literal-trash.c
@@ -1,5 +1,5 @@
 /* RUN: %clang_cc1 -fsyntax-only -verify %s
- */
+ * expected-no-diagnostics */
 # define XRECORD(x, c_name) e##c (x, __LINE__)
 
 
diff --git a/clang/test/Lexer/pragma-mark.c b/clang/test/Lexer/pragma-mark.c
index 96e8485a70a..e58b2267ddb 100644
--- a/clang/test/Lexer/pragma-mark.c
+++ b/clang/test/Lexer/pragma-mark.c
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 %s -fsyntax-only -verify
+// expected-no-diagnostics
 
 // Lexer diagnostics shouldn't be included in #pragma mark.
 #pragma mark Mike's world
diff --git a/clang/test/Lexer/rdr-6096838.c b/clang/test/Lexer/rdr-6096838.c
index d1426cca14a..b77b95e7961 100644
--- a/clang/test/Lexer/rdr-6096838.c
+++ b/clang/test/Lexer/rdr-6096838.c
@@ -2,5 +2,6 @@
  * RUN: %clang_cc1 -triple x86_64-unknown-unknown -std=gnu89 -fsyntax-only -verify %s
  rdar://6096838
  */
+// expected-no-diagnostics
 
 long double d = 0x0.0000003ffffffff00000p-16357L;