diff options
Diffstat (limited to 'test/ASTMerge')
| -rw-r--r-- | test/ASTMerge/Inputs/lit.local.cfg | 1 | ||||
| -rw-r--r-- | test/ASTMerge/category.m | 2 | ||||
| -rw-r--r-- | test/ASTMerge/class-template.cpp | 2 | ||||
| -rw-r--r-- | test/ASTMerge/class.cpp | 2 | ||||
| -rw-r--r-- | test/ASTMerge/enum.c | 2 | ||||
| -rw-r--r-- | test/ASTMerge/function.c | 2 | ||||
| -rw-r--r-- | test/ASTMerge/interface.m | 2 | ||||
| -rw-r--r-- | test/ASTMerge/namespace.cpp | 2 | ||||
| -rw-r--r-- | test/ASTMerge/property.m | 2 | ||||
| -rw-r--r-- | test/ASTMerge/struct.c | 2 | ||||
| -rw-r--r-- | test/ASTMerge/typedef.c | 2 | ||||
| -rw-r--r-- | test/ASTMerge/var.c | 2 |
12 files changed, 11 insertions, 12 deletions
diff --git a/test/ASTMerge/Inputs/lit.local.cfg b/test/ASTMerge/Inputs/lit.local.cfg deleted file mode 100644 index e6f55ee..0000000 --- a/test/ASTMerge/Inputs/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = [] diff --git a/test/ASTMerge/category.m b/test/ASTMerge/category.m index 54a1240..c7d5248 100644 --- a/test/ASTMerge/category.m +++ b/test/ASTMerge/category.m @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/category1.m // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/category2.m -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: category2.m:18:1: error: instance method 'method2' has incompatible result types in different translation units ('float' vs. 'int') // CHECK: category1.m:16:1: note: instance method 'method2' also declared here diff --git a/test/ASTMerge/class-template.cpp b/test/ASTMerge/class-template.cpp index eea31b1..0ab5443 100644 --- a/test/ASTMerge/class-template.cpp +++ b/test/ASTMerge/class-template.cpp @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/class-template1.cpp // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/class-template2.cpp -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: class-template1.cpp:7:14: error: non-type template parameter declared with incompatible types in different translation units ('int' vs. 'long') // CHECK: class-template2.cpp:7:15: note: declared here with type 'long' diff --git a/test/ASTMerge/class.cpp b/test/ASTMerge/class.cpp index 885b65e..7b31187 100644 --- a/test/ASTMerge/class.cpp +++ b/test/ASTMerge/class.cpp @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/class1.cpp // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/class2.cpp // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 -Wno-odr | count 0 +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 -Wno-odr -Werror // CHECK: class1.cpp:5:8: warning: type 'B' has incompatible definitions in different translation units // CHECK: class1.cpp:6:9: note: field 'y' has type 'float' here diff --git a/test/ASTMerge/enum.c b/test/ASTMerge/enum.c index 4380d19..7240bcc 100644 --- a/test/ASTMerge/enum.c +++ b/test/ASTMerge/enum.c @@ -1,6 +1,6 @@ // 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: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// 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 diff --git a/test/ASTMerge/function.c b/test/ASTMerge/function.c index 8a8a030..89e1c69 100644 --- a/test/ASTMerge/function.c +++ b/test/ASTMerge/function.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/function1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/function2.c -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s // CHECK: function2.c:3:6: error: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' vs. 'void (int, float)') diff --git a/test/ASTMerge/interface.m b/test/ASTMerge/interface.m index 747ef38..8ba5d73 100644 --- a/test/ASTMerge/interface.m +++ b/test/ASTMerge/interface.m @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/interface1.m // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/interface2.m -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: interface2.m:16:9: error: instance variable 'ivar2' declared with incompatible types in different translation units ('float' vs. 'int') // CHECK: interface1.m:16:7: note: declared here with type 'int' diff --git a/test/ASTMerge/namespace.cpp b/test/ASTMerge/namespace.cpp index 6c46f0a..8cc0fa2 100644 --- a/test/ASTMerge/namespace.cpp +++ b/test/ASTMerge/namespace.cpp @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/namespace1.cpp // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/namespace2.cpp -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: namespace2.cpp:16:17: error: external variable 'z' declared with incompatible types in different translation units ('double' vs. 'float') // CHECK: namespace1.cpp:16:16: note: declared here with type 'float' diff --git a/test/ASTMerge/property.m b/test/ASTMerge/property.m index a8dd7c4..4948023 100644 --- a/test/ASTMerge/property.m +++ b/test/ASTMerge/property.m @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/property1.m // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/property2.m -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: property2.m:12:26: error: property 'Prop1' declared with incompatible types in different translation units ('int' vs. 'float') // CHECK: property1.m:10:28: note: declared here with type 'float' diff --git a/test/ASTMerge/struct.c b/test/ASTMerge/struct.c index 7217222..4f41cea 100644 --- a/test/ASTMerge/struct.c +++ b/test/ASTMerge/struct.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/struct1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/struct2.c -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: struct1.c:13:8: warning: type 'struct S1' has incompatible definitions in different translation units // CHECK: struct1.c:15:7: note: field 'field2' has type 'int' here diff --git a/test/ASTMerge/typedef.c b/test/ASTMerge/typedef.c index 6f91129..79e4723 100644 --- a/test/ASTMerge/typedef.c +++ b/test/ASTMerge/typedef.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/typedef1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/typedef2.c -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: typedef2.c:4:10: error: external variable 'x2' declared with incompatible types in different translation units ('Typedef2' (aka 'double') vs. 'Typedef2' (aka 'int')) // CHECK: typedef1.c:4:10: note: declared here with type 'Typedef2' (aka 'int') diff --git a/test/ASTMerge/var.c b/test/ASTMerge/var.c index e1dde6a..e14dc37 100644 --- a/test/ASTMerge/var.c +++ b/test/ASTMerge/var.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/var1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/var2.c -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -fdiagnostics-show-note-include-stack %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -fdiagnostics-show-note-include-stack %s 2>&1 | FileCheck %s // CHECK: var2.c:2:9: error: external variable 'x1' declared with incompatible types in different translation units ('double *' vs. 'float **') // CHECK: var1.c:2:9: note: declared here with type 'float **' |
