[cfe-commits] r99209 - in /cfe/trunk/test/Sema: attr-sentinel.c function-pointer-sentinel-attribute.c

[Chris Lattner]

Author: lattner
Date: Mon Mar 22 16:02:14 2010
New Revision: 99209

URL: http://llvm.org/viewvc/llvm-project?rev=99209&view=rev
Log:
merge two tests.

Removed:
    cfe/trunk/test/Sema/function-pointer-sentinel-attribute.c
Modified:
    cfe/trunk/test/Sema/attr-sentinel.c

Modified: cfe/trunk/test/Sema/attr-sentinel.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/attr-sentinel.c?rev=99209&r1=99208&r2=99209&view=diff
==============================================================================
--- cfe/trunk/test/Sema/attr-sentinel.c (original)
+++ cfe/trunk/test/Sema/attr-sentinel.c Mon Mar 22 16:02:14 2010
@@ -11,9 +11,7 @@
 void foo10 (int x, ...) __attribute__ ((__sentinel__(1,1)));
 void foo12 (int x, ... ) ATTR; // expected-note {{function has been explicitly marked sentinel here}}
 
-int main ()
-{
-
+void test1() {
   foo1(1, NULL); // OK
   foo1(1, 0) ; // expected-warning {{missing sentinel in function call}}
   foo5(1, NULL, 2);  // OK
@@ -28,3 +26,23 @@
   foo12(1); // expected-warning {{not enough variable arguments in 'foo12' declaration to fit a sentinel}}
 }
  
+
+
+void (*e) (int arg, const char * format, ...) __attribute__ ((__sentinel__ (1,1)));
+
+void test2() {
+  void (*b) (int arg, const char * format, ...) __attribute__ ((__sentinel__));  // expected-note {{function has been explicitly marked sentinel here}}
+  void (*z) (int arg, const char * format, ...) __attribute__ ((__sentinel__ (2))); // expected-note {{function has been explicitly marked sentinel here}}
+  
+  
+  void (*y) (int arg, const char * format, ...) __attribute__ ((__sentinel__ (5))); // expected-note {{function has been explicitly marked sentinel here}}
+  
+  b(1, "%s", (void*)0); // OK
+  b(1, "%s", 0);  // expected-warning {{missing sentinel in function call}}
+  z(1, "%s",4 ,1,0);  // expected-warning {{missing sentinel in function call}}
+  z(1, "%s", (void*)0, 1, 0); // OK
+  
+  y(1, "%s", 1,2,3,4,5,6,7);  // expected-warning {{missing sentinel in function call}}
+  
+  y(1, "%s", (void*)0,3,4,5,6,7); // OK
+}

Removed: cfe/trunk/test/Sema/function-pointer-sentinel-attribute.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/function-pointer-sentinel-attribute.c?rev=99208&view=auto
==============================================================================
--- cfe/trunk/test/Sema/function-pointer-sentinel-attribute.c (original)
+++ cfe/trunk/test/Sema/function-pointer-sentinel-attribute.c (removed)
@@ -1,20 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
-
-void (*e) (int arg, const char * format, ...) __attribute__ ((__sentinel__ (1,1)));
-
-int main() {
-  void (*b) (int arg, const char * format, ...) __attribute__ ((__sentinel__));  // expected-note {{function has been explicitly marked sentinel here}}
-  void (*z) (int arg, const char * format, ...) __attribute__ ((__sentinel__ (2))); // expected-note {{function has been explicitly marked sentinel here}}
-
-
-  void (*y) (int arg, const char * format, ...) __attribute__ ((__sentinel__ (5))); // expected-note {{function has been explicitly marked sentinel here}}
-
-  b(1, "%s", (void*)0); // OK
-  b(1, "%s", 0);  // expected-warning {{missing sentinel in function call}}
-  z(1, "%s",4 ,1,0);  // expected-warning {{missing sentinel in function call}}
-  z(1, "%s", (void*)0, 1, 0); // OK
-
-  y(1, "%s", 1,2,3,4,5,6,7);  // expected-warning {{missing sentinel in function call}}
-
-  y(1, "%s", (void*)0,3,4,5,6,7); // OK
-}