summaryrefslogtreecommitdiffstats
path: root/clang/test/ASTMerge
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-02-09 22:37:58 +0000
committerDouglas Gregor <dgregor@apple.com>2010-02-09 22:37:58 +0000
commit6b2a4745311e5283e6d42def33570a9a4e063199 (patch)
tree9489ddc657ac6bd590d9d8ef0750a331c785c6ab /clang/test/ASTMerge
parentb618f66c5fdc3c273bbbf2a514e4a98ed691afc6 (diff)
downloadbcm5719-llvm-6b2a4745311e5283e6d42def33570a9a4e063199.tar.gz
bcm5719-llvm-6b2a4745311e5283e6d42def33570a9a4e063199.zip
Hook up the diagnostics-argument printer when merging AST files, so
that we get readable diagnostics such as: error: external variable 'x1' declared with incompatible types in different translation units ('double *' vs. 'float **') However, there is no translation of source locations, yet. llvm-svn: 95704
Diffstat (limited to 'clang/test/ASTMerge')
-rw-r--r--clang/test/ASTMerge/var.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/ASTMerge/var.c b/clang/test/ASTMerge/var.c
index 6e1559a399d..4fda4acb9dc 100644
--- a/clang/test/ASTMerge/var.c
+++ b/clang/test/ASTMerge/var.c
@@ -2,4 +2,4 @@
// 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 %s 2>&1 | FileCheck %s
-// CHECK: declared with incompatible types
+// CHECK: error: external variable 'x1' declared with incompatible types in different translation units ('double *' vs. 'float **')
OpenPOWER on IntegriCloud