merge two tests.

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

2 files changed, 5 insertions, 7 deletions

diff --git a/test/Sema/block-misc.c b/test/Sema/block-misc.c
index b2d4fd8229..efe021efb8 100644
--- a/test/Sema/block-misc.c
+++ b/test/Sema/block-misc.c
@@ -113,3 +113,8 @@ void test11(int i) {
 }
 
 
+void (^test12f)(void);
+void test12() {
+  test12f = ^test12f;	// expected-error {{type name requires a specifier or qualifier}} expected-error {{expected expression}}
+}
+
diff --git a/test/Sema/block-syntax-error.c b/test/Sema/block-syntax-error.c
deleted file mode 100644
index b046f46da4..0000000000
--- a/test/Sema/block-syntax-error.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: clang-cc %s -fsyntax-only -verify -fblocks
-
-void (^noop)(void);
-
-void somefunction() {
-  noop = ^noop;	// expected-error {{type name requires a specifier or qualifier}} expected-error {{expected expression}}
-}