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/enum.c | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 clang/test/ASTMerge/enum.c (limited to 'clang/test/ASTMerge/enum.c') diff --git a/clang/test/ASTMerge/enum.c b/clang/test/ASTMerge/enum.c deleted file mode 100644 index 7240bcced99..00000000000 --- a/clang/test/ASTMerge/enum.c +++ /dev/null @@ -1,25 +0,0 @@ -// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/enum1.c -// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/enum2.c -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s - -// CHECK: enum1.c:9:6: warning: type 'enum E2' has incompatible definitions in different translation units -// CHECK: enum1.c:11:3: note: enumerator 'E2Enumerator2' with value 3 here -// CHECK: enum2.c:11:3: note: enumerator 'E2Enumerator2' with value 4 here -// CHECK: enum2.c:13:3: error: external variable 'x2' declared with incompatible types in different translation units ('enum E2' vs. 'enum E2') -// CHECK: enum1.c:13:3: note: declared here with type 'enum E2' -// CHECK: enum1.c:16:6: warning: type 'enum E3' has incompatible definitions in different translation units -// CHECK: enum1.c:18:3: note: enumerator 'E3Enumerator2' with value 3 here -// CHECK: enum2.c:18:3: note: enumerator 'E3Enumerator' with value 3 here -// CHECK: enum2.c:20:3: error: external variable 'x3' declared with incompatible types in different translation units ('enum E3' vs. 'enum E3') -// CHECK: enum1.c:20:3: note: declared here with type 'enum E3' -// CHECK: enum1.c:23:6: warning: type 'enum E4' has incompatible definitions in different translation units -// CHECK: enum1.c:26:3: note: enumerator 'E4Enumerator3' with value 2 here -// CHECK: enum2.c:23:6: note: no corresponding enumerator here -// CHECK: enum2.c:26:3: error: external variable 'x4' declared with incompatible types in different translation units ('enum E4' vs. 'enum E4') -// CHECK: enum1.c:27:3: note: declared here with type 'enum E4' -// CHECK: enum1.c:30:6: warning: type 'enum E5' has incompatible definitions in different translation units -// CHECK: enum2.c:33:3: note: enumerator 'E5Enumerator4' with value 3 here -// CHECK: enum1.c:30:6: note: no corresponding enumerator here -// CHECK: enum2.c:34:3: error: external variable 'x5' declared with incompatible types in different translation units ('enum E5' vs. 'enum E5') -// CHECK: enum1.c:34:3: note: declared here with type 'enum E5' -// CHECK: 4 warnings and 4 errors generated -- cgit v1.2.3