From ee6d3fa07eed0d3187ded0cbc63fdbbdc4a8480c Mon Sep 17 00:00:00 2001 From: Sean Callanan Date: Wed, 16 Nov 2016 18:21:00 +0000 Subject: 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 --- clang/test/ASTMerge/Inputs/enum2.c | 42 -------------------------------------- 1 file changed, 42 deletions(-) delete mode 100644 clang/test/ASTMerge/Inputs/enum2.c (limited to 'clang/test/ASTMerge/Inputs/enum2.c') diff --git a/clang/test/ASTMerge/Inputs/enum2.c b/clang/test/ASTMerge/Inputs/enum2.c deleted file mode 100644 index 315b4dcb6ef..00000000000 --- a/clang/test/ASTMerge/Inputs/enum2.c +++ /dev/null @@ -1,42 +0,0 @@ -// Matching -enum E1 { - E1Enumerator1, - E1Enumerator2 = 3, - E1Enumerator3 -} x1; - -// Value mismatch -enum E2 { - E2Enumerator1, - E2Enumerator2 = 4, - E2Enumerator3 -} x2; - -// Name mismatch -enum E3 { - E3Enumerator1, - E3Enumerator = 3, - E3Enumerator3 -} x3; - -// Missing enumerator -enum E4 { - E4Enumerator1, - E4Enumerator2 -} x4; - -// Extra enumerator -enum E5 { - E5Enumerator1, - E5Enumerator2, - E5Enumerator3, - E5Enumerator4 -} x5; - -// Matching, with typedef -typedef enum { - E6Enumerator1, - E6Enumerator2 -} E6; - -E6 x6; -- cgit v1.2.3