2 files changed, 25 insertions, 27 deletions
diff --git a/clang/test/Sema/nonnull-check.c b/clang/test/Sema/nonnull-check.c
deleted file mode 100644
index 8454c7ca74c..00000000000
--- a/clang/test/Sema/nonnull-check.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: clang-cc -fblocks -Wnonnull -fsyntax-only -verify %s
-
-extern void func1 (void (^block1)(), void (^block2)(), int) __attribute__((nonnull));
-
-extern void func3 (void (^block1)(), int, void (^block2)(), int)
-  __attribute__((nonnull(1,3)));
-
-extern void func4 (void (^block1)(), void (^block2)()) __attribute__((nonnull(1)))
-  __attribute__((nonnull(2)));
-
-void
-foo (int i1, int i2, int i3, void (^cp1)(), void (^cp2)(), void (^cp3)())
-{
-  func1(cp1, cp2, i1);
-
-  func1(0, cp2, i1);  // expected-warning {{null passed to a callee which requires a non-null argument}}
-  func1(cp1, 0, i1);  // expected-warning {{null passed to a callee which requires a non-null argument}}
-  func1(cp1, cp2, 0);
-
-
-  func3(0, i2, cp3, i3); // expected-warning {{null passed to a callee which requires a non-null argument}}
-  func3(cp3, i2, 0, i3);  // expected-warning {{null passed to a callee which requires a non-null argument}}
-
-  func4(0, cp1); // expected-warning {{null passed to a callee which requires a non-null argument}}
-  func4(cp1, 0); // expected-warning {{null passed to a callee which requires a non-null argument}}
-}
diff --git a/clang/test/Sema/nonnull.c b/clang/test/Sema/nonnull.c
index 3d9b329abe6..3bed2feb501 100644
--- a/clang/test/Sema/nonnull.c
+++ b/clang/test/Sema/nonnull.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: clang-cc -fblocks -fsyntax-only -verify %s
 
 int f1(int x) __attribute__((nonnull)); // expected-warning{{'nonnull' attribute applied to function with no pointer arguments}}
 int f2(int *x) __attribute__ ((nonnull (1)));
@@ -6,3 +6,27 @@ int f3(int *x) __attribute__ ((nonnull (0))); // expected-error {{'nonnull' attr
 int f4(int *x, int *y) __attribute__ ((nonnull (1,2)));
 int f5(int *x, int *y) __attribute__ ((nonnull (2,1)));
 
+extern void func1 (void (^block1)(), void (^block2)(), int) __attribute__((nonnull));
+
+extern void func3 (void (^block1)(), int, void (^block2)(), int)
+__attribute__((nonnull(1,3)));
+
+extern void func4 (void (^block1)(), void (^block2)()) __attribute__((nonnull(1)))
+__attribute__((nonnull(2)));
+
+void
+foo (int i1, int i2, int i3, void (^cp1)(), void (^cp2)(), void (^cp3)())
+{
+  func1(cp1, cp2, i1);
+  
+  func1(0, cp2, i1);  // expected-warning {{null passed to a callee which requires a non-null argument}}
+  func1(cp1, 0, i1);  // expected-warning {{null passed to a callee which requires a non-null argument}}
+  func1(cp1, cp2, 0);
+  
+  
+  func3(0, i2, cp3, i3); // expected-warning {{null passed to a callee which requires a non-null argument}}
+  func3(cp3, i2, 0, i3);  // expected-warning {{null passed to a callee which requires a non-null argument}}
+  
+  func4(0, cp1); // expected-warning {{null passed to a callee which requires a non-null argument}}
+  func4(cp1, 0); // expected-warning {{null passed to a callee which requires a non-null argument}}
+}