Quellcode durchsuchen

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
Sean Callanan vor 8 Jahren
Ursprung
Commit
52fefd89fd
61 geänderte Dateien mit 20 neuen und 0 gelöschten Zeilen
  1. 0 0
      test/ASTMerge/anonymous-fields/Inputs/anonymous-fields1.cpp
  2. 0 0
      test/ASTMerge/anonymous-fields/Inputs/anonymous-fields2.cpp
  3. 0 0
      test/ASTMerge/anonymous-fields/test.cpp
  4. 0 0
      test/ASTMerge/asm/Inputs/asm-function.cpp
  5. 0 0
      test/ASTMerge/asm/test.cpp
  6. 0 0
      test/ASTMerge/category/Inputs/category1.m
  7. 0 0
      test/ASTMerge/category/Inputs/category2.m
  8. 0 0
      test/ASTMerge/category/test.m
  9. 0 0
      test/ASTMerge/class-template/Inputs/class-template1.cpp
  10. 0 0
      test/ASTMerge/class-template/Inputs/class-template2.cpp
  11. 0 0
      test/ASTMerge/class-template/test.cpp
  12. 0 0
      test/ASTMerge/class/Inputs/class1.cpp
  13. 0 0
      test/ASTMerge/class/Inputs/class2.cpp
  14. 0 0
      test/ASTMerge/class/test.cpp
  15. 0 0
      test/ASTMerge/class2/Inputs/class3.cpp
  16. 0 0
      test/ASTMerge/class2/test.cpp
  17. 0 0
      test/ASTMerge/codegen-body/Inputs/body1.c
  18. 0 0
      test/ASTMerge/codegen-body/Inputs/body2.c
  19. 0 0
      test/ASTMerge/codegen-body/test.c
  20. 0 0
      test/ASTMerge/codegen-exprs/Inputs/exprs1.c
  21. 0 0
      test/ASTMerge/codegen-exprs/Inputs/exprs2.c
  22. 0 0
      test/ASTMerge/codegen-exprs/test.c
  23. 0 0
      test/ASTMerge/enum/Inputs/enum1.c
  24. 0 0
      test/ASTMerge/enum/Inputs/enum2.c
  25. 0 0
      test/ASTMerge/enum/test.c
  26. 0 0
      test/ASTMerge/exprs-cpp/Inputs/exprs3.cpp
  27. 0 0
      test/ASTMerge/exprs-cpp/test.cpp
  28. 10 0
      test/ASTMerge/exprs/Inputs/exprs1.c
  29. 10 0
      test/ASTMerge/exprs/Inputs/exprs2.c
  30. 0 0
      test/ASTMerge/exprs/test.c
  31. 0 0
      test/ASTMerge/function/Inputs/function1.c
  32. 0 0
      test/ASTMerge/function/Inputs/function2.c
  33. 0 0
      test/ASTMerge/function/test.c
  34. 0 0
      test/ASTMerge/inheritance/Inputs/inheritance-base.cpp
  35. 0 0
      test/ASTMerge/inheritance/test.cpp
  36. 0 0
      test/ASTMerge/init-ctors/Inputs/init-ctors-classes.cpp
  37. 0 0
      test/ASTMerge/init-ctors/test.cpp
  38. 0 0
      test/ASTMerge/interface/Inputs/interface1.m
  39. 0 0
      test/ASTMerge/interface/Inputs/interface2.m
  40. 0 0
      test/ASTMerge/interface/test.m
  41. 0 0
      test/ASTMerge/macro/Inputs/macro.modulemap
  42. 0 0
      test/ASTMerge/macro/Inputs/macro1.h
  43. 0 0
      test/ASTMerge/macro/Inputs/macro1.m
  44. 0 0
      test/ASTMerge/macro/Inputs/macro2.m
  45. 0 0
      test/ASTMerge/macro/test.m
  46. 0 0
      test/ASTMerge/namespace/Inputs/namespace1.cpp
  47. 0 0
      test/ASTMerge/namespace/Inputs/namespace2.cpp
  48. 0 0
      test/ASTMerge/namespace/test.cpp
  49. 0 0
      test/ASTMerge/property/Inputs/property1.m
  50. 0 0
      test/ASTMerge/property/Inputs/property2.m
  51. 0 0
      test/ASTMerge/property/test.m
  52. 0 0
      test/ASTMerge/struct/Inputs/struct1.c
  53. 0 0
      test/ASTMerge/struct/Inputs/struct2.c
  54. 0 0
      test/ASTMerge/struct/test.c
  55. 0 0
      test/ASTMerge/typedef/Inputs/typedef1.c
  56. 0 0
      test/ASTMerge/typedef/Inputs/typedef2.c
  57. 0 0
      test/ASTMerge/typedef/test.c
  58. 0 0
      test/ASTMerge/var/Inputs/var1.c
  59. 0 0
      test/ASTMerge/var/Inputs/var1.h
  60. 0 0
      test/ASTMerge/var/Inputs/var2.c
  61. 0 0
      test/ASTMerge/var/test.c

+ 0 - 0
test/ASTMerge/Inputs/anonymous-fields1.cpp → test/ASTMerge/anonymous-fields/Inputs/anonymous-fields1.cpp


+ 0 - 0
test/ASTMerge/Inputs/anonymous-fields2.cpp → test/ASTMerge/anonymous-fields/Inputs/anonymous-fields2.cpp


+ 0 - 0
test/ASTMerge/anonymous-fields.cpp → test/ASTMerge/anonymous-fields/test.cpp


+ 0 - 0
test/ASTMerge/Inputs/asm-function.cpp → test/ASTMerge/asm/Inputs/asm-function.cpp


+ 0 - 0
test/ASTMerge/asm.cpp → test/ASTMerge/asm/test.cpp


+ 0 - 0
test/ASTMerge/Inputs/category1.m → test/ASTMerge/category/Inputs/category1.m


+ 0 - 0
test/ASTMerge/Inputs/category2.m → test/ASTMerge/category/Inputs/category2.m


+ 0 - 0
test/ASTMerge/category.m → test/ASTMerge/category/test.m


+ 0 - 0
test/ASTMerge/Inputs/class-template1.cpp → test/ASTMerge/class-template/Inputs/class-template1.cpp


+ 0 - 0
test/ASTMerge/Inputs/class-template2.cpp → test/ASTMerge/class-template/Inputs/class-template2.cpp


+ 0 - 0
test/ASTMerge/class-template.cpp → test/ASTMerge/class-template/test.cpp


+ 0 - 0
test/ASTMerge/Inputs/class1.cpp → test/ASTMerge/class/Inputs/class1.cpp


+ 0 - 0
test/ASTMerge/Inputs/class2.cpp → test/ASTMerge/class/Inputs/class2.cpp


+ 0 - 0
test/ASTMerge/class.cpp → test/ASTMerge/class/test.cpp


+ 0 - 0
test/ASTMerge/Inputs/class3.cpp → test/ASTMerge/class2/Inputs/class3.cpp


+ 0 - 0
test/ASTMerge/class2.cpp → test/ASTMerge/class2/test.cpp


+ 0 - 0
test/ASTMerge/Inputs/body1.c → test/ASTMerge/codegen-body/Inputs/body1.c


+ 0 - 0
test/ASTMerge/Inputs/body2.c → test/ASTMerge/codegen-body/Inputs/body2.c


+ 0 - 0
test/ASTMerge/codegen-body.c → test/ASTMerge/codegen-body/test.c


+ 0 - 0
test/ASTMerge/Inputs/exprs1.c → test/ASTMerge/codegen-exprs/Inputs/exprs1.c


+ 0 - 0
test/ASTMerge/Inputs/exprs2.c → test/ASTMerge/codegen-exprs/Inputs/exprs2.c


+ 0 - 0
test/ASTMerge/codegen-exprs.c → test/ASTMerge/codegen-exprs/test.c


+ 0 - 0
test/ASTMerge/Inputs/enum1.c → test/ASTMerge/enum/Inputs/enum1.c


+ 0 - 0
test/ASTMerge/Inputs/enum2.c → test/ASTMerge/enum/Inputs/enum2.c


+ 0 - 0
test/ASTMerge/enum.c → test/ASTMerge/enum/test.c


+ 0 - 0
test/ASTMerge/Inputs/exprs3.cpp → test/ASTMerge/exprs-cpp/Inputs/exprs3.cpp


+ 0 - 0
test/ASTMerge/exprs.cpp → test/ASTMerge/exprs-cpp/test.cpp


+ 10 - 0
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
+};
+

+ 10 - 0
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
+};
+

+ 0 - 0
test/ASTMerge/exprs.c → test/ASTMerge/exprs/test.c


+ 0 - 0
test/ASTMerge/Inputs/function1.c → test/ASTMerge/function/Inputs/function1.c


+ 0 - 0
test/ASTMerge/Inputs/function2.c → test/ASTMerge/function/Inputs/function2.c


+ 0 - 0
test/ASTMerge/function.c → test/ASTMerge/function/test.c


+ 0 - 0
test/ASTMerge/Inputs/inheritance-base.cpp → test/ASTMerge/inheritance/Inputs/inheritance-base.cpp


+ 0 - 0
test/ASTMerge/inheritance.cpp → test/ASTMerge/inheritance/test.cpp


+ 0 - 0
test/ASTMerge/Inputs/init-ctors-classes.cpp → test/ASTMerge/init-ctors/Inputs/init-ctors-classes.cpp


+ 0 - 0
test/ASTMerge/init-ctors.cpp → test/ASTMerge/init-ctors/test.cpp


+ 0 - 0
test/ASTMerge/Inputs/interface1.m → test/ASTMerge/interface/Inputs/interface1.m


+ 0 - 0
test/ASTMerge/Inputs/interface2.m → test/ASTMerge/interface/Inputs/interface2.m


+ 0 - 0
test/ASTMerge/interface.m → test/ASTMerge/interface/test.m


+ 0 - 0
test/ASTMerge/Inputs/macro.modulemap → test/ASTMerge/macro/Inputs/macro.modulemap


+ 0 - 0
test/ASTMerge/Inputs/macro1.h → test/ASTMerge/macro/Inputs/macro1.h


+ 0 - 0
test/ASTMerge/Inputs/macro1.m → test/ASTMerge/macro/Inputs/macro1.m


+ 0 - 0
test/ASTMerge/Inputs/macro2.m → test/ASTMerge/macro/Inputs/macro2.m


+ 0 - 0
test/ASTMerge/macro.m → test/ASTMerge/macro/test.m


+ 0 - 0
test/ASTMerge/Inputs/namespace1.cpp → test/ASTMerge/namespace/Inputs/namespace1.cpp


+ 0 - 0
test/ASTMerge/Inputs/namespace2.cpp → test/ASTMerge/namespace/Inputs/namespace2.cpp


+ 0 - 0
test/ASTMerge/namespace.cpp → test/ASTMerge/namespace/test.cpp


+ 0 - 0
test/ASTMerge/Inputs/property1.m → test/ASTMerge/property/Inputs/property1.m


+ 0 - 0
test/ASTMerge/Inputs/property2.m → test/ASTMerge/property/Inputs/property2.m


+ 0 - 0
test/ASTMerge/property.m → test/ASTMerge/property/test.m


+ 0 - 0
test/ASTMerge/Inputs/struct1.c → test/ASTMerge/struct/Inputs/struct1.c


+ 0 - 0
test/ASTMerge/Inputs/struct2.c → test/ASTMerge/struct/Inputs/struct2.c


+ 0 - 0
test/ASTMerge/struct.c → test/ASTMerge/struct/test.c


+ 0 - 0
test/ASTMerge/Inputs/typedef1.c → test/ASTMerge/typedef/Inputs/typedef1.c


+ 0 - 0
test/ASTMerge/Inputs/typedef2.c → test/ASTMerge/typedef/Inputs/typedef2.c


+ 0 - 0
test/ASTMerge/typedef.c → test/ASTMerge/typedef/test.c


+ 0 - 0
test/ASTMerge/Inputs/var1.c → test/ASTMerge/var/Inputs/var1.c


+ 0 - 0
test/ASTMerge/Inputs/var1.h → test/ASTMerge/var/Inputs/var1.h


+ 0 - 0
test/ASTMerge/Inputs/var2.c → test/ASTMerge/var/Inputs/var2.c


+ 0 - 0
test/ASTMerge/var.c → test/ASTMerge/var/test.c