Update clang to r84949.

1 files changed, 6 insertions, 9 deletions

diff --git a/test/Misc/message-length.c b/test/Misc/message-length.c
index ac5dab9..9f4d66f 100644
--- a/test/Misc/message-length.c
+++ b/test/Misc/message-length.c
@@ -1,14 +1,7 @@
-// RUN: clang -fsyntax-only -fmessage-length=72 %s 2> %t &&
-
-// RUN: grep -A4 "FILE:23" %t > %t.msg &&
-// FIXME: This diagnostic is getting truncated very poorly.
-// RUN: grep -e '^  ...// some long comment text and a brace, eh {} ' %t.msg &&
-// RUN: grep -e '^                                                 \^' %t.msg &&
-// RUN: clang -fsyntax-only -fmessage-length=1 %s &&
-// RUN: true
+// RUN: clang -fsyntax-only -fmessage-length=72 %s 2>&1 | FileCheck -strict-whitespace %s &&
+// RUN: clang -fsyntax-only -fmessage-length=1 %s
 
 // Hack so we can check things better, force the file name and line.
-
 # 1 "FILE" 1
 
 /* It's tough to verify the results of this test mechanically, since
@@ -33,3 +26,7 @@ void a_very_long_line(int *ip, float *FloatPointer) {
 }
 
 #pragma STDC CX_LIMITED_RANGE    // some long comment text and a brace, eh {}
+
+
+// CHECK: FILE:23:78
+// CHECK: {{^  ...// some long comment text and a brace, eh {} $}}