[cfe-commits] r151819 - in /cfe/trunk/test: Lexer/has_attribute.cpp Preprocessor/has_attribute.c

[Jean-Daniel Dupas]

Author: jddupas
Date: Thu Mar  1 11:45:53 2012
New Revision: 151819

URL: http://llvm.org/viewvc/llvm-project?rev=151819&view=rev
Log:
Merge __has_attribute tests. Patch by Jonathan Sauer!


Removed:
    cfe/trunk/test/Lexer/has_attribute.cpp
Modified:
    cfe/trunk/test/Preprocessor/has_attribute.c

Removed: cfe/trunk/test/Lexer/has_attribute.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/has_attribute.cpp?rev=151818&view=auto
==============================================================================
--- cfe/trunk/test/Lexer/has_attribute.cpp (original)
+++ cfe/trunk/test/Lexer/has_attribute.cpp (removed)
@@ -1,12 +0,0 @@
-// RUN: %clang_cc1 -E %s -o - | FileCheck %s
-
-// CHECK: always_inline
-#if __has_attribute(always_inline)
-int always_inline();
-#endif
-
-// CHECK: no_dummy_attribute
-#if !__has_attribute(dummy_attribute)
-int no_dummy_attribute();
-#endif
-

Modified: cfe/trunk/test/Preprocessor/has_attribute.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/has_attribute.c?rev=151819&r1=151818&r2=151819&view=diff
==============================================================================
--- cfe/trunk/test/Preprocessor/has_attribute.c (original)
+++ cfe/trunk/test/Preprocessor/has_attribute.c Thu Mar  1 11:45:53 2012
@@ -1,14 +1,26 @@
-// RUN: %clang_cc1 %s
-// RUN: %clang_cc1 %s -E
-#ifndef __has_attribute
-#error Should have __has_attribute
+// RUN: %clang_cc1 -E %s -o - | FileCheck %s
+
+// CHECK: always_inline
+#if __has_attribute(always_inline)
+int always_inline();
+#endif
+
+// CHECK: __always_inline__
+#if __has_attribute(__always_inline__)
+int __always_inline__();
+#endif
+
+// CHECK: no_dummy_attribute
+#if !__has_attribute(dummy_attribute)
+int no_dummy_attribute();
 #endif
 
-#if __has_attribute(something_we_dont_have)
-#error Bad
+// CHECK: has_has_attribute
+#ifdef __has_attribute
+int has_has_attribute();
 #endif
 
-#if !__has_attribute(__always_inline__) || \
-    !__has_attribute(always_inline)
-#error Clang should have this
+// CHECK: has_something_we_dont_have
+#if !__has_attribute(something_we_dont_have)
+int has_something_we_dont_have();
 #endif