Merge header & cpp for test/PCH/attrs.c - more convenient to keep the tests in one source file.

llvm-svn: 116736

2 files changed, 12 insertions, 10 deletions

diff --git a/clang/test/PCH/attrs.c b/clang/test/PCH/attrs.c
index c9711935c07..2f868ac6624 100644
--- a/clang/test/PCH/attrs.c
+++ b/clang/test/PCH/attrs.c
@@ -1,8 +1,17 @@
 // Test this without pch.
-// RUN: %clang_cc1 -include %S/attrs.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %s -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: %clang_cc1 -emit-pch -o %t %S/attrs.h
+// RUN: %clang_cc1 -emit-pch -o %t %s
 // RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
-// expected-note{{previous overload}}
+
+#ifndef HEADER
+#define HEADER
+
+int f(int) __attribute__((visibility("default"), overloadable)); // expected-note{{previous overload}}
+
+#else
+
 double f(double); // expected-error{{overloadable}}
+
+#endif
diff --git a/clang/test/PCH/attrs.h b/clang/test/PCH/attrs.h
deleted file mode 100644
index 58f05897043..00000000000
--- a/clang/test/PCH/attrs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Header for PCH test exprs.c
-
-
-
-
-
-int f(int) __attribute__((visibility("default"), overloadable));