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 829bc0edd30..829bc0edd30 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 28ea46d9871..28ea46d9871 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 67afc29d07e..67afc29d07e 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 59c4edfbcd2..59c4edfbcd2 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 3a0a205720f..3a0a205720f 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 afcaab81f2b..afcaab81f2b 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 49a3c270a1c..49a3c270a1c 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 c7d52481649..c7d52481649 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 440b5abfc86..440b5abfc86 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 6300301a4ff..6300301a4ff 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 0ab5443db7f..0ab5443db7f 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 b0a7645cfe6..b0a7645cfe6 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 2bed6d775bc..2bed6d775bc 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 a68a2d1d769..a68a2d1d769 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 428acc3f031..428acc3f031 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 6021403d722..6021403d722 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 d4d1e4b9378..d4d1e4b9378 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 73cb1edf991..73cb1edf991 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 7232bf4164b..7232bf4164b 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 1c268da15f3..1c268da15f3 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 1c268da15f3..1c268da15f3 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 b5069f993be..b5069f993be 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 f2b9c5c98fd..f2b9c5c98fd 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 315b4dcb6ef..315b4dcb6ef 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 7240bcced99..7240bcced99 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 7ed8e338452..7ed8e338452 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 ba1f18b2c90..ba1f18b2c90 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 00000000000..1c268da15f3
--- /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 00000000000..1c268da15f3
--- /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 7495bb6a874..7495bb6a874 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 4523bd3d79b..4523bd3d79b 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 6ca810a6f20..6ca810a6f20 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 650f719d1fa..650f719d1fa 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 26fe42eb64d..26fe42eb64d 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 7fce82a736a..7fce82a736a 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 fd51f860634..fd51f860634 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 5f0ba4decd9..5f0ba4decd9 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 5865c0eff07..5865c0eff07 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 2133bd1381a..2133bd1381a 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 8ba5d73753a..8ba5d73753a 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 dba1f2207f1..dba1f2207f1 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 96133949678..96133949678 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 2612613bd0b..2612613bd0b 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 b5b155a95b5..b5b155a95b5 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 77e596d3bae..77e596d3bae 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 1ff84f3111c..1ff84f3111c 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 80429f700b1..80429f700b1 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 8cc0fa2a6d9..8cc0fa2a6d9 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 22fe0a02220..22fe0a02220 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 64a03fb04ec..64a03fb04ec 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 49480234769..49480234769 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 af2af8abc42..af2af8abc42 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 4b43df71d8d..4b43df71d8d 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 4f41cea26b1..4f41cea26b1 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 56576756856..56576756856 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 129d7101e91..129d7101e91 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 79e47231187..79e47231187 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 4f5cbe16ab6..4f5cbe16ab6 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 1518e17ef0c..1518e17ef0c 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 01986e4208c..01986e4208c 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 e14dc37edac..e14dc37edac 100644
--- a/clang/test/ASTMerge/var.c
+++ b/clang/test/ASTMerge/var/test.c