[PATCH] D26571: Clean up layout of ASTMerge tests

[Sean Callanan via cfe-commits]

spyffe created this revision.
spyffe added a reviewer: a.sidorin.
spyffe added a subscriber: cfe-commits.
spyffe set the repository for this revision to rL LLVM.

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/a1.c
  a/a2.c

for all existing tests.  I have also eliminated interdependencies (by replicating the input files for each test that uses them) and made a little `lit.cfg` that makes sure that lit only processes `test.c`/`test.m`/`test.cpp`/`test.mm`.


Repository:
  rL LLVM

https://reviews.llvm.org/D26571

Files:
  test/ASTMerge/Inputs/anonymous-fields1.cpp
  test/ASTMerge/Inputs/anonymous-fields2.cpp
  test/ASTMerge/Inputs/asm-function.cpp
  test/ASTMerge/Inputs/body1.c
  test/ASTMerge/Inputs/body2.c
  test/ASTMerge/Inputs/category1.m
  test/ASTMerge/Inputs/category2.m
  test/ASTMerge/Inputs/class-template1.cpp
  test/ASTMerge/Inputs/class-template2.cpp
  test/ASTMerge/Inputs/class1.cpp
  test/ASTMerge/Inputs/class2.cpp
  test/ASTMerge/Inputs/class3.cpp
  test/ASTMerge/Inputs/enum1.c
  test/ASTMerge/Inputs/enum2.c
  test/ASTMerge/Inputs/exprs1.c
  test/ASTMerge/Inputs/exprs2.c
  test/ASTMerge/Inputs/exprs3.cpp
  test/ASTMerge/Inputs/function1.c
  test/ASTMerge/Inputs/function2.c
  test/ASTMerge/Inputs/inheritance-base.cpp
  test/ASTMerge/Inputs/init-ctors-classes.cpp
  test/ASTMerge/Inputs/interface1.m
  test/ASTMerge/Inputs/interface2.m
  test/ASTMerge/Inputs/macro.modulemap
  test/ASTMerge/Inputs/macro1.h
  test/ASTMerge/Inputs/macro1.m
  test/ASTMerge/Inputs/macro2.m
  test/ASTMerge/Inputs/namespace1.cpp
  test/ASTMerge/Inputs/namespace2.cpp
  test/ASTMerge/Inputs/property1.m
  test/ASTMerge/Inputs/property2.m
  test/ASTMerge/Inputs/struct1.c
  test/ASTMerge/Inputs/struct2.c
  test/ASTMerge/Inputs/typedef1.c
  test/ASTMerge/Inputs/typedef2.c
  test/ASTMerge/Inputs/var1.c
  test/ASTMerge/Inputs/var1.h
  test/ASTMerge/Inputs/var2.c
  test/ASTMerge/anonymous-fields.cpp
  test/ASTMerge/anonymous-fields/anonymous-fields1.cpp
  test/ASTMerge/anonymous-fields/anonymous-fields2.cpp
  test/ASTMerge/anonymous-fields/test.cpp
  test/ASTMerge/asm.cpp
  test/ASTMerge/asm/asm-function.cpp
  test/ASTMerge/asm/test.cpp
  test/ASTMerge/category.m
  test/ASTMerge/category/category1.m
  test/ASTMerge/category/category2.m
  test/ASTMerge/category/test.m
  test/ASTMerge/class-template.cpp
  test/ASTMerge/class-template/class-template1.cpp
  test/ASTMerge/class-template/class-template2.cpp
  test/ASTMerge/class-template/test.cpp
  test/ASTMerge/class.cpp
  test/ASTMerge/class/class1.cpp
  test/ASTMerge/class/class2.cpp
  test/ASTMerge/class/test.cpp
  test/ASTMerge/class2.cpp
  test/ASTMerge/class2/class3.cpp
  test/ASTMerge/class2/test.cpp
  test/ASTMerge/codegen-body.c
  test/ASTMerge/codegen-body/body1.c
  test/ASTMerge/codegen-body/body2.c
  test/ASTMerge/codegen-body/test.c
  test/ASTMerge/codegen-exprs.c
  test/ASTMerge/codegen-exprs/exprs1.c
  test/ASTMerge/codegen-exprs/exprs2.c
  test/ASTMerge/codegen-exprs/test.c
  test/ASTMerge/enum.c
  test/ASTMerge/enum/enum1.c
  test/ASTMerge/enum/enum2.c
  test/ASTMerge/enum/test.c
  test/ASTMerge/exprs-cpp/exprs3.cpp
  test/ASTMerge/exprs-cpp/test.cpp
  test/ASTMerge/exprs.c
  test/ASTMerge/exprs.cpp
  test/ASTMerge/exprs/exprs.c
  test/ASTMerge/exprs/exprs1.c
  test/ASTMerge/exprs/exprs2.c
  test/ASTMerge/function.c
  test/ASTMerge/function/function1.c
  test/ASTMerge/function/function2.c
  test/ASTMerge/function/test.c
  test/ASTMerge/inheritance.cpp
  test/ASTMerge/inheritance/inheritance-base.cpp
  test/ASTMerge/inheritance/test.cpp
  test/ASTMerge/init-ctors.cpp
  test/ASTMerge/init-ctors/init-ctors-classes.cpp
  test/ASTMerge/init-ctors/test.cpp
  test/ASTMerge/interface.m
  test/ASTMerge/interface/interface1.m
  test/ASTMerge/interface/interface2.m
  test/ASTMerge/interface/test.m
  test/ASTMerge/macro.m
  test/ASTMerge/macro/macro.modulemap
  test/ASTMerge/macro/macro1.h
  test/ASTMerge/macro/macro1.m
  test/ASTMerge/macro/macro2.m
  test/ASTMerge/macro/test.m
  test/ASTMerge/namespace.cpp
  test/ASTMerge/namespace/namespace1.cpp
  test/ASTMerge/namespace/namespace2.cpp
  test/ASTMerge/namespace/test.cpp
  test/ASTMerge/property.m
  test/ASTMerge/property/property1.m
  test/ASTMerge/property/property2.m
  test/ASTMerge/property/test.m
  test/ASTMerge/struct.c
  test/ASTMerge/struct/struct1.c
  test/ASTMerge/struct/struct2.c
  test/ASTMerge/struct/test.c
  test/ASTMerge/typedef.c
  test/ASTMerge/typedef/test.c
  test/ASTMerge/typedef/typedef1.c
  test/ASTMerge/typedef/typedef2.c
  test/ASTMerge/var.c
  test/ASTMerge/var/test.c
  test/ASTMerge/var/var1.c
  test/ASTMerge/var/var1.h
  test/ASTMerge/var/var2.c

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D26571.77700.patch
Type: text/x-patch
Size: 59702 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20161112/bba51d75/attachment-0001.bin>