merge recovery-1 into recovery-3.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60930 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 15 insertions, 16 deletions

diff --git a/test/Parser/recovery-1.c b/test/Parser/recovery-1.c
deleted file mode 100644
index fa7892db2c..0000000000
--- a/test/Parser/recovery-1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: clang -fsyntax-only -fno-caret-diagnostics -pedantic %s 2>&1 | grep warning | wc -l | grep 1 &&
-// RUN: clang -fsyntax-only -verify -pedantic %s
-
-char ((((                       /* expected-note {{to match this '('}} */
-*X x ] ))));                    /* expected-error {{expected ')'}} */
-
-;   // expected-warning {{ISO C does not allow an extra ';' outside of a function}}
-
-
-
-
-struct S { void *X, *Y; };
-
-struct S A = {
-	&BADIDENT, 0     /* expected-error {{use of undeclared identifier}} */
-};
diff --git a/test/Parser/recovery-3.c b/test/Parser/recovery-3.c
index 0c8206fe28..ca92260372 100644
--- a/test/Parser/recovery-3.c
+++ b/test/Parser/recovery-3.c
@@ -44,3 +44,18 @@ int test(int) {
     ;
 }
 
+
+
+char ((((                       /* expected-note {{to match this '('}} */
+         *X x ] ))));                    /* expected-error {{expected ')'}} */
+
+;   // expected-warning {{ISO C does not allow an extra ';' outside of a function}}
+
+
+
+
+struct S { void *X, *Y; };
+
+struct S A = {
+&BADIDENT, 0     /* expected-error {{use of undeclared identifier}} */
+};