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

61 files changed, 20 insertions, 0 deletions

diff --git a/clang/test/ASTMerge/Inputs/anonymous-fields1.cpp b/clang/test/ASTMerge/anonymous-fields/Inputs/anonymous-fields1.cpp
index 829bc0e..829bc0e 100644
--- a/clang/test/ASTMerge/Inputs/anonymous-fields1.cpp
+++ b/clang/test/ASTMerge/anonymous-fields/Inputs/anonymous-fields1.cpp
diff --git a/clang/test/ASTMerge/Inputs/anonymous-fields2.cpp b/clang/test/ASTMerge/anonymous-fields/Inputs/anonymous-fields2.cpp
index 28ea46d..28ea46d 100644
--- a/clang/test/ASTMerge/Inputs/anonymous-fields2.cpp
+++ b/clang/test/ASTMerge/anonymous-fields/Inputs/anonymous-fields2.cpp
diff --git a/clang/test/ASTMerge/anonymous-fields.cpp b/clang/test/ASTMerge/anonymous-fields/test.cpp
index 67afc29..67afc29 100644
--- a/clang/test/ASTMerge/anonymous-fields.cpp
+++ b/clang/test/ASTMerge/anonymous-fields/test.cpp
diff --git a/clang/test/ASTMerge/Inputs/asm-function.cpp b/clang/test/ASTMerge/asm/Inputs/asm-function.cpp
index 59c4edf..59c4edf 100644
--- a/clang/test/ASTMerge/Inputs/asm-function.cpp
+++ b/clang/test/ASTMerge/asm/Inputs/asm-function.cpp
diff --git a/clang/test/ASTMerge/asm.cpp b/clang/test/ASTMerge/asm/test.cpp
index 3a0a205..3a0a205 100644
--- a/clang/test/ASTMerge/asm.cpp
+++ b/clang/test/ASTMerge/asm/test.cpp
diff --git a/clang/test/ASTMerge/Inputs/category1.m b/clang/test/ASTMerge/category/Inputs/category1.m
index afcaab8..afcaab8 100644
--- a/clang/test/ASTMerge/Inputs/category1.m
+++ b/clang/test/ASTMerge/category/Inputs/category1.m
diff --git a/clang/test/ASTMerge/Inputs/category2.m b/clang/test/ASTMerge/category/Inputs/category2.m
index 49a3c27..49a3c27 100644
--- a/clang/test/ASTMerge/Inputs/category2.m
+++ b/clang/test/ASTMerge/category/Inputs/category2.m
diff --git a/clang/test/ASTMerge/category.m b/clang/test/ASTMerge/category/test.m
index c7d5248..c7d5248 100644
--- a/clang/test/ASTMerge/category.m
+++ b/clang/test/ASTMerge/category/test.m
diff --git a/clang/test/ASTMerge/Inputs/class-template1.cpp b/clang/test/ASTMerge/class-template/Inputs/class-template1.cpp
index 440b5ab..440b5ab 100644
--- a/clang/test/ASTMerge/Inputs/class-template1.cpp
+++ b/clang/test/ASTMerge/class-template/Inputs/class-template1.cpp
diff --git a/clang/test/ASTMerge/Inputs/class-template2.cpp b/clang/test/ASTMerge/class-template/Inputs/class-template2.cpp
index 6300301..6300301 100644
--- a/clang/test/ASTMerge/Inputs/class-template2.cpp
+++ b/clang/test/ASTMerge/class-template/Inputs/class-template2.cpp
diff --git a/clang/test/ASTMerge/class-template.cpp b/clang/test/ASTMerge/class-template/test.cpp
index 0ab5443..0ab5443 100644
--- a/clang/test/ASTMerge/class-template.cpp
+++ b/clang/test/ASTMerge/class-template/test.cpp
diff --git a/clang/test/ASTMerge/Inputs/class1.cpp b/clang/test/ASTMerge/class/Inputs/class1.cpp
index b0a7645..b0a7645 100644
--- a/clang/test/ASTMerge/Inputs/class1.cpp
+++ b/clang/test/ASTMerge/class/Inputs/class1.cpp
diff --git a/clang/test/ASTMerge/Inputs/class2.cpp b/clang/test/ASTMerge/class/Inputs/class2.cpp
index 2bed6d7..2bed6d7 100644
--- a/clang/test/ASTMerge/Inputs/class2.cpp
+++ b/clang/test/ASTMerge/class/Inputs/class2.cpp
diff --git a/clang/test/ASTMerge/class.cpp b/clang/test/ASTMerge/class/test.cpp
index a68a2d1..a68a2d1 100644
--- a/clang/test/ASTMerge/class.cpp
+++ b/clang/test/ASTMerge/class/test.cpp
diff --git a/clang/test/ASTMerge/Inputs/class3.cpp b/clang/test/ASTMerge/class2/Inputs/class3.cpp
index 428acc3..428acc3 100644
--- a/clang/test/ASTMerge/Inputs/class3.cpp
+++ b/clang/test/ASTMerge/class2/Inputs/class3.cpp
diff --git a/clang/test/ASTMerge/class2.cpp b/clang/test/ASTMerge/class2/test.cpp
index 6021403..6021403 100644
--- a/clang/test/ASTMerge/class2.cpp
+++ b/clang/test/ASTMerge/class2/test.cpp
diff --git a/clang/test/ASTMerge/Inputs/body1.c b/clang/test/ASTMerge/codegen-body/Inputs/body1.c
index d4d1e4b..d4d1e4b 100644
--- a/clang/test/ASTMerge/Inputs/body1.c
+++ b/clang/test/ASTMerge/codegen-body/Inputs/body1.c
diff --git a/clang/test/ASTMerge/Inputs/body2.c b/clang/test/ASTMerge/codegen-body/Inputs/body2.c
index 73cb1ed..73cb1ed 100644
--- a/clang/test/ASTMerge/Inputs/body2.c
+++ b/clang/test/ASTMerge/codegen-body/Inputs/body2.c
diff --git a/clang/test/ASTMerge/codegen-body.c b/clang/test/ASTMerge/codegen-body/test.c
index 7232bf4..7232bf4 100644
--- a/clang/test/ASTMerge/codegen-body.c
+++ b/clang/test/ASTMerge/codegen-body/test.c
diff --git a/clang/test/ASTMerge/Inputs/exprs1.c b/clang/test/ASTMerge/codegen-exprs/Inputs/exprs1.c
index 1c268da..1c268da 100644
--- a/clang/test/ASTMerge/Inputs/exprs1.c
+++ b/clang/test/ASTMerge/codegen-exprs/Inputs/exprs1.c
diff --git a/clang/test/ASTMerge/Inputs/exprs2.c b/clang/test/ASTMerge/codegen-exprs/Inputs/exprs2.c
index 1c268da..1c268da 100644
--- a/clang/test/ASTMerge/Inputs/exprs2.c
+++ b/clang/test/ASTMerge/codegen-exprs/Inputs/exprs2.c
diff --git a/clang/test/ASTMerge/codegen-exprs.c b/clang/test/ASTMerge/codegen-exprs/test.c
index b5069f9..b5069f9 100644
--- a/clang/test/ASTMerge/codegen-exprs.c
+++ b/clang/test/ASTMerge/codegen-exprs/test.c
diff --git a/clang/test/ASTMerge/Inputs/enum1.c b/clang/test/ASTMerge/enum/Inputs/enum1.c
index f2b9c5c..f2b9c5c 100644
--- a/clang/test/ASTMerge/Inputs/enum1.c
+++ b/clang/test/ASTMerge/enum/Inputs/enum1.c
diff --git a/clang/test/ASTMerge/Inputs/enum2.c b/clang/test/ASTMerge/enum/Inputs/enum2.c
index 315b4dc..315b4dc 100644
--- a/clang/test/ASTMerge/Inputs/enum2.c
+++ b/clang/test/ASTMerge/enum/Inputs/enum2.c
diff --git a/clang/test/ASTMerge/enum.c b/clang/test/ASTMerge/enum/test.c
index 7240bcc..7240bcc 100644
--- a/clang/test/ASTMerge/enum.c
+++ b/clang/test/ASTMerge/enum/test.c
diff --git a/clang/test/ASTMerge/Inputs/exprs3.cpp b/clang/test/ASTMerge/exprs-cpp/Inputs/exprs3.cpp
index 7ed8e33..7ed8e33 100644
--- a/clang/test/ASTMerge/Inputs/exprs3.cpp
+++ b/clang/test/ASTMerge/exprs-cpp/Inputs/exprs3.cpp
diff --git a/clang/test/ASTMerge/exprs.cpp b/clang/test/ASTMerge/exprs-cpp/test.cpp
index ba1f18b..ba1f18b 100644
--- a/clang/test/ASTMerge/exprs.cpp
+++ b/clang/test/ASTMerge/exprs-cpp/test.cpp
diff --git a/clang/test/ASTMerge/exprs/Inputs/exprs1.c b/clang/test/ASTMerge/exprs/Inputs/exprs1.c
new file mode 100644
index 0000000..1c268da
--- /dev/null
+++ b/clang/test/ASTMerge/exprs/Inputs/exprs1.c
@@ -0,0 +1,10 @@
+// Matching
+enum E0 {
+  E0_Val0 = 'a',
+  E0_Val1 = (17),
+  E0_Val2 = (1 << 2),
+  E0_Val3 = E0_Val2,
+  E0_Val4 = sizeof(int*),
+  E0_Val5 = (unsigned int)-1
+};
+
diff --git a/clang/test/ASTMerge/exprs/Inputs/exprs2.c b/clang/test/ASTMerge/exprs/Inputs/exprs2.c
new file mode 100644
index 0000000..1c268da
--- /dev/null
+++ b/clang/test/ASTMerge/exprs/Inputs/exprs2.c
@@ -0,0 +1,10 @@
+// Matching
+enum E0 {
+  E0_Val0 = 'a',
+  E0_Val1 = (17),
+  E0_Val2 = (1 << 2),
+  E0_Val3 = E0_Val2,
+  E0_Val4 = sizeof(int*),
+  E0_Val5 = (unsigned int)-1
+};
+
diff --git a/clang/test/ASTMerge/exprs.c b/clang/test/ASTMerge/exprs/test.c
index 7495bb6..7495bb6 100644
--- a/clang/test/ASTMerge/exprs.c
+++ b/clang/test/ASTMerge/exprs/test.c
diff --git a/clang/test/ASTMerge/Inputs/function1.c b/clang/test/ASTMerge/function/Inputs/function1.c
index 4523bd3..4523bd3 100644
--- a/clang/test/ASTMerge/Inputs/function1.c
+++ b/clang/test/ASTMerge/function/Inputs/function1.c
diff --git a/clang/test/ASTMerge/Inputs/function2.c b/clang/test/ASTMerge/function/Inputs/function2.c
index 6ca810a..6ca810a 100644
--- a/clang/test/ASTMerge/Inputs/function2.c
+++ b/clang/test/ASTMerge/function/Inputs/function2.c
diff --git a/clang/test/ASTMerge/function.c b/clang/test/ASTMerge/function/test.c
index 650f719..650f719 100644
--- a/clang/test/ASTMerge/function.c
+++ b/clang/test/ASTMerge/function/test.c
diff --git a/clang/test/ASTMerge/Inputs/inheritance-base.cpp b/clang/test/ASTMerge/inheritance/Inputs/inheritance-base.cpp
index 26fe42e..26fe42e 100644
--- a/clang/test/ASTMerge/Inputs/inheritance-base.cpp
+++ b/clang/test/ASTMerge/inheritance/Inputs/inheritance-base.cpp
diff --git a/clang/test/ASTMerge/inheritance.cpp b/clang/test/ASTMerge/inheritance/test.cpp
index 7fce82a..7fce82a 100644
--- a/clang/test/ASTMerge/inheritance.cpp
+++ b/clang/test/ASTMerge/inheritance/test.cpp
diff --git a/clang/test/ASTMerge/Inputs/init-ctors-classes.cpp b/clang/test/ASTMerge/init-ctors/Inputs/init-ctors-classes.cpp
index fd51f86..fd51f86 100644
--- a/clang/test/ASTMerge/Inputs/init-ctors-classes.cpp
+++ b/clang/test/ASTMerge/init-ctors/Inputs/init-ctors-classes.cpp
diff --git a/clang/test/ASTMerge/init-ctors.cpp b/clang/test/ASTMerge/init-ctors/test.cpp
index 5f0ba4d..5f0ba4d 100644
--- a/clang/test/ASTMerge/init-ctors.cpp
+++ b/clang/test/ASTMerge/init-ctors/test.cpp
diff --git a/clang/test/ASTMerge/Inputs/interface1.m b/clang/test/ASTMerge/interface/Inputs/interface1.m
index 5865c0e..5865c0e 100644
--- a/clang/test/ASTMerge/Inputs/interface1.m
+++ b/clang/test/ASTMerge/interface/Inputs/interface1.m
diff --git a/clang/test/ASTMerge/Inputs/interface2.m b/clang/test/ASTMerge/interface/Inputs/interface2.m
index 2133bd1..2133bd1 100644
--- a/clang/test/ASTMerge/Inputs/interface2.m
+++ b/clang/test/ASTMerge/interface/Inputs/interface2.m
diff --git a/clang/test/ASTMerge/interface.m b/clang/test/ASTMerge/interface/test.m
index 8ba5d73..8ba5d73 100644
--- a/clang/test/ASTMerge/interface.m
+++ b/clang/test/ASTMerge/interface/test.m
diff --git a/clang/test/ASTMerge/Inputs/macro.modulemap b/clang/test/ASTMerge/macro/Inputs/macro.modulemap
index dba1f22..dba1f22 100644
--- a/clang/test/ASTMerge/Inputs/macro.modulemap
+++ b/clang/test/ASTMerge/macro/Inputs/macro.modulemap
diff --git a/clang/test/ASTMerge/Inputs/macro1.h b/clang/test/ASTMerge/macro/Inputs/macro1.h
index 9613394..9613394 100644
--- a/clang/test/ASTMerge/Inputs/macro1.h
+++ b/clang/test/ASTMerge/macro/Inputs/macro1.h
diff --git a/clang/test/ASTMerge/Inputs/macro1.m b/clang/test/ASTMerge/macro/Inputs/macro1.m
index 2612613..2612613 100644
--- a/clang/test/ASTMerge/Inputs/macro1.m
+++ b/clang/test/ASTMerge/macro/Inputs/macro1.m
diff --git a/clang/test/ASTMerge/Inputs/macro2.m b/clang/test/ASTMerge/macro/Inputs/macro2.m
index b5b155a..b5b155a 100644
--- a/clang/test/ASTMerge/Inputs/macro2.m
+++ b/clang/test/ASTMerge/macro/Inputs/macro2.m
diff --git a/clang/test/ASTMerge/macro.m b/clang/test/ASTMerge/macro/test.m
index 77e596d..77e596d 100644
--- a/clang/test/ASTMerge/macro.m
+++ b/clang/test/ASTMerge/macro/test.m
diff --git a/clang/test/ASTMerge/Inputs/namespace1.cpp b/clang/test/ASTMerge/namespace/Inputs/namespace1.cpp
index 1ff84f31..1ff84f31 100644
--- a/clang/test/ASTMerge/Inputs/namespace1.cpp
+++ b/clang/test/ASTMerge/namespace/Inputs/namespace1.cpp
diff --git a/clang/test/ASTMerge/Inputs/namespace2.cpp b/clang/test/ASTMerge/namespace/Inputs/namespace2.cpp
index 80429f7..80429f7 100644
--- a/clang/test/ASTMerge/Inputs/namespace2.cpp
+++ b/clang/test/ASTMerge/namespace/Inputs/namespace2.cpp
diff --git a/clang/test/ASTMerge/namespace.cpp b/clang/test/ASTMerge/namespace/test.cpp
index 8cc0fa2..8cc0fa2 100644
--- a/clang/test/ASTMerge/namespace.cpp
+++ b/clang/test/ASTMerge/namespace/test.cpp
diff --git a/clang/test/ASTMerge/Inputs/property1.m b/clang/test/ASTMerge/property/Inputs/property1.m
index 22fe0a0..22fe0a0 100644
--- a/clang/test/ASTMerge/Inputs/property1.m
+++ b/clang/test/ASTMerge/property/Inputs/property1.m
diff --git a/clang/test/ASTMerge/Inputs/property2.m b/clang/test/ASTMerge/property/Inputs/property2.m
index 64a03fb..64a03fb 100644
--- a/clang/test/ASTMerge/Inputs/property2.m
+++ b/clang/test/ASTMerge/property/Inputs/property2.m
diff --git a/clang/test/ASTMerge/property.m b/clang/test/ASTMerge/property/test.m
index 4948023..4948023 100644
--- a/clang/test/ASTMerge/property.m
+++ b/clang/test/ASTMerge/property/test.m
diff --git a/clang/test/ASTMerge/Inputs/struct1.c b/clang/test/ASTMerge/struct/Inputs/struct1.c
index af2af8a..af2af8a 100644
--- a/clang/test/ASTMerge/Inputs/struct1.c
+++ b/clang/test/ASTMerge/struct/Inputs/struct1.c
diff --git a/clang/test/ASTMerge/Inputs/struct2.c b/clang/test/ASTMerge/struct/Inputs/struct2.c
index 4b43df7..4b43df7 100644
--- a/clang/test/ASTMerge/Inputs/struct2.c
+++ b/clang/test/ASTMerge/struct/Inputs/struct2.c
diff --git a/clang/test/ASTMerge/struct.c b/clang/test/ASTMerge/struct/test.c
index 4f41cea..4f41cea 100644
--- a/clang/test/ASTMerge/struct.c
+++ b/clang/test/ASTMerge/struct/test.c
diff --git a/clang/test/ASTMerge/Inputs/typedef1.c b/clang/test/ASTMerge/typedef/Inputs/typedef1.c
index 56576756..56576756 100644
--- a/clang/test/ASTMerge/Inputs/typedef1.c
+++ b/clang/test/ASTMerge/typedef/Inputs/typedef1.c
diff --git a/clang/test/ASTMerge/Inputs/typedef2.c b/clang/test/ASTMerge/typedef/Inputs/typedef2.c
index 129d710..129d710 100644
--- a/clang/test/ASTMerge/Inputs/typedef2.c
+++ b/clang/test/ASTMerge/typedef/Inputs/typedef2.c
diff --git a/clang/test/ASTMerge/typedef.c b/clang/test/ASTMerge/typedef/test.c
index 79e4723..79e4723 100644
--- a/clang/test/ASTMerge/typedef.c
+++ b/clang/test/ASTMerge/typedef/test.c
diff --git a/clang/test/ASTMerge/Inputs/var1.c b/clang/test/ASTMerge/var/Inputs/var1.c
index 4f5cbe1..4f5cbe1 100644
--- a/clang/test/ASTMerge/Inputs/var1.c
+++ b/clang/test/ASTMerge/var/Inputs/var1.c
diff --git a/clang/test/ASTMerge/Inputs/var1.h b/clang/test/ASTMerge/var/Inputs/var1.h
index 1518e17..1518e17 100644
--- a/clang/test/ASTMerge/Inputs/var1.h
+++ b/clang/test/ASTMerge/var/Inputs/var1.h
diff --git a/clang/test/ASTMerge/Inputs/var2.c b/clang/test/ASTMerge/var/Inputs/var2.c
index 01986e4..01986e4 100644
--- a/clang/test/ASTMerge/Inputs/var2.c
+++ b/clang/test/ASTMerge/var/Inputs/var2.c
diff --git a/clang/test/ASTMerge/var.c b/clang/test/ASTMerge/var/test.c
index e14dc37..e14dc37 100644
--- a/clang/test/ASTMerge/var.c
+++ b/clang/test/ASTMerge/var/test.c