[cfe-commits] r130839 - in /cfe/trunk/test/PCH: cxx-static_assert.cpp cxx-static_assert.h

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Wed May  4 09:58:28 2011
New Revision: 130839

URL: http://llvm.org/viewvc/llvm-project?rev=130839&view=rev
Log:
Change test/PCH/cxx-static_assert.cpp so that it doesn't need a separate header.

Removed:
    cfe/trunk/test/PCH/cxx-static_assert.h
Modified:
    cfe/trunk/test/PCH/cxx-static_assert.cpp

Modified: cfe/trunk/test/PCH/cxx-static_assert.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/cxx-static_assert.cpp?rev=130839&r1=130838&r2=130839&view=diff
==============================================================================
--- cfe/trunk/test/PCH/cxx-static_assert.cpp (original)
+++ cfe/trunk/test/PCH/cxx-static_assert.cpp Wed May  4 09:58:28 2011
@@ -1,11 +1,20 @@
 // Test this without pch.
-// RUN: %clang_cc1 -include %S/cxx-static_assert.h -verify -std=c++0x %s
+// RUN: %clang_cc1 -include %s -verify -std=c++0x %s
 
 // Test with pch.
-// RUN: %clang_cc1 -x c++-header -std=c++0x -emit-pch -o %t %S/cxx-static_assert.h
+// RUN: %clang_cc1 -std=c++0x -emit-pch -o %t %s
 // RUN: %clang_cc1 -include-pch %t -verify -std=c++0x %s 
 
-// expected-error {{static_assert failed "N is not 2!"}}
+#ifndef HEADER
+#define HEADER
+
+template<int N> struct T {
+    static_assert(N == 2, "N is not 2!"); // expected-error {{static_assert failed "N is not 2!"}}
+};
+
+#else
 
 T<1> t1; // expected-note {{in instantiation of template class 'T<1>' requested here}}
 T<2> t2;
+
+#endif

Removed: cfe/trunk/test/PCH/cxx-static_assert.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/cxx-static_assert.h?rev=130838&view=auto
==============================================================================
--- cfe/trunk/test/PCH/cxx-static_assert.h (original)
+++ cfe/trunk/test/PCH/cxx-static_assert.h (removed)
@@ -1,9 +0,0 @@
-// Header for PCH test cxx-static_assert.cpp
-
-
-
-
-
-template<int N> struct T {
-    static_assert(N == 2, "N is not 2!");
-};