[cfe-commits] r97062 - in /cfe/trunk/test/ASTMerge: Inputs/namespace1.cpp Inputs/namespace2.cpp namespace.cpp

[Douglas Gregor]

Author: dgregor
Date: Wed Feb 24 15:53:36 2010
New Revision: 97062

URL: http://llvm.org/viewvc/llvm-project?rev=97062&view=rev
Log:
Add test for AST importing of C++ namespaces, missing from a prior commit

Added:
    cfe/trunk/test/ASTMerge/Inputs/namespace1.cpp
    cfe/trunk/test/ASTMerge/Inputs/namespace2.cpp
    cfe/trunk/test/ASTMerge/namespace.cpp

Added: cfe/trunk/test/ASTMerge/Inputs/namespace1.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ASTMerge/Inputs/namespace1.cpp?rev=97062&view=auto
==============================================================================
--- cfe/trunk/test/ASTMerge/Inputs/namespace1.cpp (added)
+++ cfe/trunk/test/ASTMerge/Inputs/namespace1.cpp Wed Feb 24 15:53:36 2010
@@ -0,0 +1,17 @@
+// Merge success
+namespace N1 {
+  int x;
+}
+
+// Merge multiple namespaces
+namespace N2 {
+  extern int x;
+}
+namespace N2 {
+  extern float y;
+}
+
+// Merge namespace with conflict
+namespace N3 {
+  extern float z;
+}

Added: cfe/trunk/test/ASTMerge/Inputs/namespace2.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ASTMerge/Inputs/namespace2.cpp?rev=97062&view=auto
==============================================================================
--- cfe/trunk/test/ASTMerge/Inputs/namespace2.cpp (added)
+++ cfe/trunk/test/ASTMerge/Inputs/namespace2.cpp Wed Feb 24 15:53:36 2010
@@ -0,0 +1,17 @@
+// Merge success
+namespace N1 {
+  extern int x0;
+}
+
+// Merge multiple namespaces
+namespace N2 {
+  extern int x;
+}
+namespace N2 {
+  extern float y;
+}
+
+// Merge namespace with conflict
+namespace N3 {
+  extern double z;
+}

Added: cfe/trunk/test/ASTMerge/namespace.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ASTMerge/namespace.cpp?rev=97062&view=auto
==============================================================================
--- cfe/trunk/test/ASTMerge/namespace.cpp (added)
+++ cfe/trunk/test/ASTMerge/namespace.cpp Wed Feb 24 15:53:36 2010
@@ -0,0 +1,6 @@
+// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/namespace1.cpp
+// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/namespace2.cpp
+// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s
+
+// CHECK: namespace2.cpp:16:17: error: external variable 'z' declared with incompatible types in different translation units ('double' vs. 'float')
+// CHECK: namespace1.cpp:16:16: note: declared here with type 'float'