From 0333dd95636da52229ca14b4e5525c1cd8ba62d2 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 14 May 2019 18:51:07 +0000 Subject: Restore test files accidentally deleted in r354839 I think there must be a bug in git-llvm causing parent directories to be deleted when the diff deletes files in a subdirectory. Perhaps it is Windows-only. There has been a behavior change, so some of these tests now fail. I have marked them XFAIL and will fix them in a follow-up to separate the changes. llvm-svn: 360699 --- .../test/ASTMerge/namespace/Inputs/namespace1.cpp | 27 ++++++++++++++++++++++ 1 file changed, 27 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..4a539523aae --- /dev/null +++ b/clang/test/ASTMerge/namespace/Inputs/namespace1.cpp @@ -0,0 +1,27 @@ +// 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; +} + +namespace AliasWithSameName = N3; + +namespace TestUnresolvedTypenameAndValueDecls { +template class Base { +public: + typedef T foo; + void bar(); +}; +} -- cgit v1.2.3