From: Sean Callanan Date: Wed, 16 Nov 2016 18:21:00 +0000 (+0000) Subject: Fixed layout of test/ASTMerge. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52fefd89fd4c7ce3d10b9df5ec0b1da5258fb33f;p=clang 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 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@287129 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/ASTMerge/Inputs/anonymous-fields1.cpp b/test/ASTMerge/anonymous-fields/Inputs/anonymous-fields1.cpp similarity index 100% rename from test/ASTMerge/Inputs/anonymous-fields1.cpp rename to test/ASTMerge/anonymous-fields/Inputs/anonymous-fields1.cpp diff --git a/test/ASTMerge/Inputs/anonymous-fields2.cpp b/test/ASTMerge/anonymous-fields/Inputs/anonymous-fields2.cpp similarity index 100% rename from test/ASTMerge/Inputs/anonymous-fields2.cpp rename to test/ASTMerge/anonymous-fields/Inputs/anonymous-fields2.cpp diff --git a/test/ASTMerge/anonymous-fields.cpp b/test/ASTMerge/anonymous-fields/test.cpp similarity index 100% rename from test/ASTMerge/anonymous-fields.cpp rename to test/ASTMerge/anonymous-fields/test.cpp diff --git a/test/ASTMerge/Inputs/asm-function.cpp b/test/ASTMerge/asm/Inputs/asm-function.cpp similarity index 100% rename from test/ASTMerge/Inputs/asm-function.cpp rename to test/ASTMerge/asm/Inputs/asm-function.cpp diff --git a/test/ASTMerge/asm.cpp b/test/ASTMerge/asm/test.cpp similarity index 100% rename from test/ASTMerge/asm.cpp rename to test/ASTMerge/asm/test.cpp diff --git a/test/ASTMerge/Inputs/category1.m b/test/ASTMerge/category/Inputs/category1.m similarity index 100% rename from test/ASTMerge/Inputs/category1.m rename to test/ASTMerge/category/Inputs/category1.m diff --git a/test/ASTMerge/Inputs/category2.m b/test/ASTMerge/category/Inputs/category2.m similarity index 100% rename from test/ASTMerge/Inputs/category2.m rename to test/ASTMerge/category/Inputs/category2.m diff --git a/test/ASTMerge/category.m b/test/ASTMerge/category/test.m similarity index 100% rename from test/ASTMerge/category.m rename to test/ASTMerge/category/test.m diff --git a/test/ASTMerge/Inputs/class-template1.cpp b/test/ASTMerge/class-template/Inputs/class-template1.cpp similarity index 100% rename from test/ASTMerge/Inputs/class-template1.cpp rename to test/ASTMerge/class-template/Inputs/class-template1.cpp diff --git a/test/ASTMerge/Inputs/class-template2.cpp b/test/ASTMerge/class-template/Inputs/class-template2.cpp similarity index 100% rename from test/ASTMerge/Inputs/class-template2.cpp rename to test/ASTMerge/class-template/Inputs/class-template2.cpp diff --git a/test/ASTMerge/class-template.cpp b/test/ASTMerge/class-template/test.cpp similarity index 100% rename from test/ASTMerge/class-template.cpp rename to test/ASTMerge/class-template/test.cpp diff --git a/test/ASTMerge/Inputs/class1.cpp b/test/ASTMerge/class/Inputs/class1.cpp similarity index 100% rename from test/ASTMerge/Inputs/class1.cpp rename to test/ASTMerge/class/Inputs/class1.cpp diff --git a/test/ASTMerge/Inputs/class2.cpp b/test/ASTMerge/class/Inputs/class2.cpp similarity index 100% rename from test/ASTMerge/Inputs/class2.cpp rename to test/ASTMerge/class/Inputs/class2.cpp diff --git a/test/ASTMerge/class.cpp b/test/ASTMerge/class/test.cpp similarity index 100% rename from test/ASTMerge/class.cpp rename to test/ASTMerge/class/test.cpp diff --git a/test/ASTMerge/Inputs/class3.cpp b/test/ASTMerge/class2/Inputs/class3.cpp similarity index 100% rename from test/ASTMerge/Inputs/class3.cpp rename to test/ASTMerge/class2/Inputs/class3.cpp diff --git a/test/ASTMerge/class2.cpp b/test/ASTMerge/class2/test.cpp similarity index 100% rename from test/ASTMerge/class2.cpp rename to test/ASTMerge/class2/test.cpp diff --git a/test/ASTMerge/Inputs/body1.c b/test/ASTMerge/codegen-body/Inputs/body1.c similarity index 100% rename from test/ASTMerge/Inputs/body1.c rename to test/ASTMerge/codegen-body/Inputs/body1.c diff --git a/test/ASTMerge/Inputs/body2.c b/test/ASTMerge/codegen-body/Inputs/body2.c similarity index 100% rename from test/ASTMerge/Inputs/body2.c rename to test/ASTMerge/codegen-body/Inputs/body2.c diff --git a/test/ASTMerge/codegen-body.c b/test/ASTMerge/codegen-body/test.c similarity index 100% rename from test/ASTMerge/codegen-body.c rename to test/ASTMerge/codegen-body/test.c diff --git a/test/ASTMerge/Inputs/exprs1.c b/test/ASTMerge/codegen-exprs/Inputs/exprs1.c similarity index 100% rename from test/ASTMerge/Inputs/exprs1.c rename to test/ASTMerge/codegen-exprs/Inputs/exprs1.c diff --git a/test/ASTMerge/Inputs/exprs2.c b/test/ASTMerge/codegen-exprs/Inputs/exprs2.c similarity index 100% rename from test/ASTMerge/Inputs/exprs2.c rename to test/ASTMerge/codegen-exprs/Inputs/exprs2.c diff --git a/test/ASTMerge/codegen-exprs.c b/test/ASTMerge/codegen-exprs/test.c similarity index 100% rename from test/ASTMerge/codegen-exprs.c rename to test/ASTMerge/codegen-exprs/test.c diff --git a/test/ASTMerge/Inputs/enum1.c b/test/ASTMerge/enum/Inputs/enum1.c similarity index 100% rename from test/ASTMerge/Inputs/enum1.c rename to test/ASTMerge/enum/Inputs/enum1.c diff --git a/test/ASTMerge/Inputs/enum2.c b/test/ASTMerge/enum/Inputs/enum2.c similarity index 100% rename from test/ASTMerge/Inputs/enum2.c rename to test/ASTMerge/enum/Inputs/enum2.c diff --git a/test/ASTMerge/enum.c b/test/ASTMerge/enum/test.c similarity index 100% rename from test/ASTMerge/enum.c rename to test/ASTMerge/enum/test.c diff --git a/test/ASTMerge/Inputs/exprs3.cpp b/test/ASTMerge/exprs-cpp/Inputs/exprs3.cpp similarity index 100% rename from test/ASTMerge/Inputs/exprs3.cpp rename to test/ASTMerge/exprs-cpp/Inputs/exprs3.cpp diff --git a/test/ASTMerge/exprs.cpp b/test/ASTMerge/exprs-cpp/test.cpp similarity index 100% rename from test/ASTMerge/exprs.cpp rename to test/ASTMerge/exprs-cpp/test.cpp diff --git a/test/ASTMerge/exprs/Inputs/exprs1.c b/test/ASTMerge/exprs/Inputs/exprs1.c new file mode 100644 index 0000000000..1c268da15f --- /dev/null +++ b/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/test/ASTMerge/exprs/Inputs/exprs2.c b/test/ASTMerge/exprs/Inputs/exprs2.c new file mode 100644 index 0000000000..1c268da15f --- /dev/null +++ b/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/test/ASTMerge/exprs.c b/test/ASTMerge/exprs/test.c similarity index 100% rename from test/ASTMerge/exprs.c rename to test/ASTMerge/exprs/test.c diff --git a/test/ASTMerge/Inputs/function1.c b/test/ASTMerge/function/Inputs/function1.c similarity index 100% rename from test/ASTMerge/Inputs/function1.c rename to test/ASTMerge/function/Inputs/function1.c diff --git a/test/ASTMerge/Inputs/function2.c b/test/ASTMerge/function/Inputs/function2.c similarity index 100% rename from test/ASTMerge/Inputs/function2.c rename to test/ASTMerge/function/Inputs/function2.c diff --git a/test/ASTMerge/function.c b/test/ASTMerge/function/test.c similarity index 100% rename from test/ASTMerge/function.c rename to test/ASTMerge/function/test.c diff --git a/test/ASTMerge/Inputs/inheritance-base.cpp b/test/ASTMerge/inheritance/Inputs/inheritance-base.cpp similarity index 100% rename from test/ASTMerge/Inputs/inheritance-base.cpp rename to test/ASTMerge/inheritance/Inputs/inheritance-base.cpp diff --git a/test/ASTMerge/inheritance.cpp b/test/ASTMerge/inheritance/test.cpp similarity index 100% rename from test/ASTMerge/inheritance.cpp rename to test/ASTMerge/inheritance/test.cpp diff --git a/test/ASTMerge/Inputs/init-ctors-classes.cpp b/test/ASTMerge/init-ctors/Inputs/init-ctors-classes.cpp similarity index 100% rename from test/ASTMerge/Inputs/init-ctors-classes.cpp rename to test/ASTMerge/init-ctors/Inputs/init-ctors-classes.cpp diff --git a/test/ASTMerge/init-ctors.cpp b/test/ASTMerge/init-ctors/test.cpp similarity index 100% rename from test/ASTMerge/init-ctors.cpp rename to test/ASTMerge/init-ctors/test.cpp diff --git a/test/ASTMerge/Inputs/interface1.m b/test/ASTMerge/interface/Inputs/interface1.m similarity index 100% rename from test/ASTMerge/Inputs/interface1.m rename to test/ASTMerge/interface/Inputs/interface1.m diff --git a/test/ASTMerge/Inputs/interface2.m b/test/ASTMerge/interface/Inputs/interface2.m similarity index 100% rename from test/ASTMerge/Inputs/interface2.m rename to test/ASTMerge/interface/Inputs/interface2.m diff --git a/test/ASTMerge/interface.m b/test/ASTMerge/interface/test.m similarity index 100% rename from test/ASTMerge/interface.m rename to test/ASTMerge/interface/test.m diff --git a/test/ASTMerge/Inputs/macro.modulemap b/test/ASTMerge/macro/Inputs/macro.modulemap similarity index 100% rename from test/ASTMerge/Inputs/macro.modulemap rename to test/ASTMerge/macro/Inputs/macro.modulemap diff --git a/test/ASTMerge/Inputs/macro1.h b/test/ASTMerge/macro/Inputs/macro1.h similarity index 100% rename from test/ASTMerge/Inputs/macro1.h rename to test/ASTMerge/macro/Inputs/macro1.h diff --git a/test/ASTMerge/Inputs/macro1.m b/test/ASTMerge/macro/Inputs/macro1.m similarity index 100% rename from test/ASTMerge/Inputs/macro1.m rename to test/ASTMerge/macro/Inputs/macro1.m diff --git a/test/ASTMerge/Inputs/macro2.m b/test/ASTMerge/macro/Inputs/macro2.m similarity index 100% rename from test/ASTMerge/Inputs/macro2.m rename to test/ASTMerge/macro/Inputs/macro2.m diff --git a/test/ASTMerge/macro.m b/test/ASTMerge/macro/test.m similarity index 100% rename from test/ASTMerge/macro.m rename to test/ASTMerge/macro/test.m diff --git a/test/ASTMerge/Inputs/namespace1.cpp b/test/ASTMerge/namespace/Inputs/namespace1.cpp similarity index 100% rename from test/ASTMerge/Inputs/namespace1.cpp rename to test/ASTMerge/namespace/Inputs/namespace1.cpp diff --git a/test/ASTMerge/Inputs/namespace2.cpp b/test/ASTMerge/namespace/Inputs/namespace2.cpp similarity index 100% rename from test/ASTMerge/Inputs/namespace2.cpp rename to test/ASTMerge/namespace/Inputs/namespace2.cpp diff --git a/test/ASTMerge/namespace.cpp b/test/ASTMerge/namespace/test.cpp similarity index 100% rename from test/ASTMerge/namespace.cpp rename to test/ASTMerge/namespace/test.cpp diff --git a/test/ASTMerge/Inputs/property1.m b/test/ASTMerge/property/Inputs/property1.m similarity index 100% rename from test/ASTMerge/Inputs/property1.m rename to test/ASTMerge/property/Inputs/property1.m diff --git a/test/ASTMerge/Inputs/property2.m b/test/ASTMerge/property/Inputs/property2.m similarity index 100% rename from test/ASTMerge/Inputs/property2.m rename to test/ASTMerge/property/Inputs/property2.m diff --git a/test/ASTMerge/property.m b/test/ASTMerge/property/test.m similarity index 100% rename from test/ASTMerge/property.m rename to test/ASTMerge/property/test.m diff --git a/test/ASTMerge/Inputs/struct1.c b/test/ASTMerge/struct/Inputs/struct1.c similarity index 100% rename from test/ASTMerge/Inputs/struct1.c rename to test/ASTMerge/struct/Inputs/struct1.c diff --git a/test/ASTMerge/Inputs/struct2.c b/test/ASTMerge/struct/Inputs/struct2.c similarity index 100% rename from test/ASTMerge/Inputs/struct2.c rename to test/ASTMerge/struct/Inputs/struct2.c diff --git a/test/ASTMerge/struct.c b/test/ASTMerge/struct/test.c similarity index 100% rename from test/ASTMerge/struct.c rename to test/ASTMerge/struct/test.c diff --git a/test/ASTMerge/Inputs/typedef1.c b/test/ASTMerge/typedef/Inputs/typedef1.c similarity index 100% rename from test/ASTMerge/Inputs/typedef1.c rename to test/ASTMerge/typedef/Inputs/typedef1.c diff --git a/test/ASTMerge/Inputs/typedef2.c b/test/ASTMerge/typedef/Inputs/typedef2.c similarity index 100% rename from test/ASTMerge/Inputs/typedef2.c rename to test/ASTMerge/typedef/Inputs/typedef2.c diff --git a/test/ASTMerge/typedef.c b/test/ASTMerge/typedef/test.c similarity index 100% rename from test/ASTMerge/typedef.c rename to test/ASTMerge/typedef/test.c diff --git a/test/ASTMerge/Inputs/var1.c b/test/ASTMerge/var/Inputs/var1.c similarity index 100% rename from test/ASTMerge/Inputs/var1.c rename to test/ASTMerge/var/Inputs/var1.c diff --git a/test/ASTMerge/Inputs/var1.h b/test/ASTMerge/var/Inputs/var1.h similarity index 100% rename from test/ASTMerge/Inputs/var1.h rename to test/ASTMerge/var/Inputs/var1.h diff --git a/test/ASTMerge/Inputs/var2.c b/test/ASTMerge/var/Inputs/var2.c similarity index 100% rename from test/ASTMerge/Inputs/var2.c rename to test/ASTMerge/var/Inputs/var2.c diff --git a/test/ASTMerge/var.c b/test/ASTMerge/var/test.c similarity index 100% rename from test/ASTMerge/var.c rename to test/ASTMerge/var/test.c