aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorGeoffrey Keating <geoffk@apple.com>2005-01-04 02:13:56 +0000
committerGeoffrey Keating <geoffk@gcc.gnu.org>2005-01-04 02:13:56 +0000
commit942926ad9aaed64e1fd18ca1a44ab04de79e632d (patch)
tree52c88aedd7f1c8d991064ad1952bd3983c447b8a /gcc
parent1eb3331e96ce4c7652004ef02da7ca9e72539555 (diff)
downloadgcc-942926ad9aaed64e1fd18ca1a44ab04de79e632d.zip
gcc-942926ad9aaed64e1fd18ca1a44ab04de79e632d.tar.gz
gcc-942926ad9aaed64e1fd18ca1a44ab04de79e632d.tar.bz2
Index: libcpp/ChangeLog
2005-01-03 Geoffrey Keating <geoffk@apple.com> * files.c (_cpp_find_file): Add files found by search_path_exhausted to the list of all files. Index: gcc/testsuite/ChangeLog 2005-01-03 Geoffrey Keating <geoffk@apple.com> Robert Bowdidge <bowdidge@apple.com> * gcc.dg/cpp/subframework1.c: New. * gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/A.h: New. * gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/B.h: New. * gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/C.h: New. * gcc.dg/cpp/frame/one.framework/Headers/one-includeSubs.h: New. Co-Authored-By: Robert Bowdidge <bowdidge@apple.com> From-SVN: r92883
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog9
-rw-r--r--gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/A.h1
-rw-r--r--gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/B.h1
-rw-r--r--gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/C.h4
-rw-r--r--gcc/testsuite/gcc.dg/cpp/frame/one.framework/Headers/one-includeSubs.h2
-rw-r--r--gcc/testsuite/gcc.dg/cpp/subframework1.c15
6 files changed, 32 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f74a542..a55eb02 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,13 @@
2005-01-03 Geoffrey Keating <geoffk@apple.com>
+ Robert Bowdidge <bowdidge@apple.com>
+
+ * gcc.dg/cpp/subframework1.c: New.
+ * gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/A.h: New.
+ * gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/B.h: New.
+ * gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/C.h: New.
+ * gcc.dg/cpp/frame/one.framework/Headers/one-includeSubs.h: New.
+
+2005-01-03 Geoffrey Keating <geoffk@apple.com>
* gcc.dg/darwin-weakimport-1.c: Remove check for variables
producing warning.
diff --git a/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/A.h b/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/A.h
new file mode 100644
index 0000000..5573729
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/A.h
@@ -0,0 +1 @@
+#import <OneSub/C.h>
diff --git a/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/B.h b/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/B.h
new file mode 100644
index 0000000..5573729
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/B.h
@@ -0,0 +1 @@
+#import <OneSub/C.h>
diff --git a/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/C.h b/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/C.h
new file mode 100644
index 0000000..5afd8050
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/C.h
@@ -0,0 +1,4 @@
+#ifdef ONESUB_C_INCLUDED
+#error should only be imported once
+#endif
+#define ONESUB_C_INCLUDED 1
diff --git a/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Headers/one-includeSubs.h b/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Headers/one-includeSubs.h
new file mode 100644
index 0000000..adaeb95
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/frame/one.framework/Headers/one-includeSubs.h
@@ -0,0 +1,2 @@
+#import <OneSub/A.h>
+#import <OneSub/B.h>
diff --git a/gcc/testsuite/gcc.dg/cpp/subframework1.c b/gcc/testsuite/gcc.dg/cpp/subframework1.c
new file mode 100644
index 0000000..fd560fa
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/subframework1.c
@@ -0,0 +1,15 @@
+/* Copyright (C) 2004 Free Software Foundation, Inc. */
+
+/* { dg-do preprocess } */
+/* { dg-options "-F$srcdir/gcc.dg/cpp/frame" } */
+
+/* Contributed by Robert Bowdidge <bowdidge@apple.com> */
+/* include a file from a subframework that will import two files that
+ both look at the same file. Make sure we only include that file once;
+ if so, the program will compile fine. If not, we'll get redefinition
+ errors */
+
+#include <one/one-includeSubs.h>
+#ifndef ONESUB_C_INCLUDED
+#error C.h not included
+#endif