diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-12-30 11:49:41 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-12-30 11:49:41 +0000 |
| commit | 45b533945f0851ec234ca846e1af5ee1e4df0b6e (patch) | |
| tree | 0a5b74c0b9ca73aded34df95c91fcaf3815230d8 /test/ASTMerge | |
| parent | 7e86edd64bfae4e324224452e4ea879b3371a4bd (diff) | |
| download | src-45b533945f0851ec234ca846e1af5ee1e4df0b6e.tar.gz src-45b533945f0851ec234ca846e1af5ee1e4df0b6e.zip | |
Vendor import of clang trunk r256633:vendor/clang/clang-trunk-r256633
Notes
Notes:
svn path=/vendor/clang/dist/; revision=292920
svn path=/vendor/clang/clang-trunk-r256633/; revision=292923; tag=vendor/clang/clang-trunk-r256633
Diffstat (limited to 'test/ASTMerge')
| -rw-r--r-- | test/ASTMerge/codegen-exprs.c | 6 | ||||
| -rw-r--r-- | test/ASTMerge/exprs.c | 6 | ||||
| -rw-r--r-- | test/ASTMerge/function.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/test/ASTMerge/codegen-exprs.c b/test/ASTMerge/codegen-exprs.c index 6c4a575d6096..b5069f993be5 100644 --- a/test/ASTMerge/codegen-exprs.c +++ b/test/ASTMerge/codegen-exprs.c @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/exprs1.c -// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/exprs2.c -// RUN: %clang_cc1 -emit-obj -o /dev/null -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-pch -o %t.1.ast %S/Inputs/exprs1.c +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-pch -o %t.2.ast %S/Inputs/exprs2.c +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-obj -o /dev/null -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s // expected-no-diagnostics diff --git a/test/ASTMerge/exprs.c b/test/ASTMerge/exprs.c index c82e6831f5c6..7495bb6a874a 100644 --- a/test/ASTMerge/exprs.c +++ b/test/ASTMerge/exprs.c @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/exprs1.c -// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/exprs2.c -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-pch -o %t.1.ast %S/Inputs/exprs1.c +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-pch -o %t.2.ast %S/Inputs/exprs2.c +// RUN: %clang_cc1 -triple %itanium_abi_triple -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s // expected-no-diagnostics diff --git a/test/ASTMerge/function.c b/test/ASTMerge/function.c index 89e1c699c3aa..650f719d1fa8 100644 --- a/test/ASTMerge/function.c +++ b/test/ASTMerge/function.c @@ -3,7 +3,7 @@ // 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)') +// CHECK: function2.c:3:6: error: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' (aka 'void (int, double)') vs. 'void (int, float)') // CHECK: function1.c:2:6: note: declared here with type 'void (int, float)' // CHECK: function2.c:5:6: error: external function 'f3' declared with incompatible types in different translation units ('void (int)' vs. 'void (void)') // CHECK: function1.c:4:6: note: declared here with type 'void (void)' |