From ee6d3fa07eed0d3187ded0cbc63fdbbdc4a8480c Mon Sep 17 00:00:00 2001 From: Sean Callanan Date: Wed, 16 Nov 2016 18:21:00 +0000 Subject: Fixed layout of test/ASTMerge. As outlined in a previous RFC, the test/ASTMerge/Inputs folder is getting full and the tests are starting to become interdependent. This is undesirable because - it makes it harder to write new tests - it makes it harder to figure out at a glance what old tests are doing, and - it adds the risk of breaking one test while changing a different one, because of the interdependencies. To fix this, according to the conversation in the RFC, I have changed the layout from a.c Inputs/a1.c Inputs/a2.c to a/test.c a/Inputs/a1.c a/Inputs/a2.c for all existing tests. I have also eliminated interdependencies by replicating the input files for each test that uses them. https://reviews.llvm.org/D26571 llvm-svn: 287129 --- clang/test/ASTMerge/namespace/Inputs/namespace1.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 clang/test/ASTMerge/namespace/Inputs/namespace1.cpp (limited to 'clang/test/ASTMerge/namespace/Inputs/namespace1.cpp') diff --git a/clang/test/ASTMerge/namespace/Inputs/namespace1.cpp b/clang/test/ASTMerge/namespace/Inputs/namespace1.cpp new file mode 100644 index 00000000000..1ff84f3111c --- /dev/null +++ b/clang/test/ASTMerge/namespace/Inputs/namespace1.cpp @@ -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; +} -- cgit v1.2.3