summaryrefslogtreecommitdiffstats
path: root/clang/test/ASTMerge/var.c
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-03-27 20:00:08 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-03-27 20:00:08 +0000
commit24284afa2d97401743d664f39a5faf00db7d6afd (patch)
tree4350b92e9c5cf9fedc22676d6e3743100a21be76 /clang/test/ASTMerge/var.c
parentb3b1e17645ba01ecae56a8f217aec96a690a014c (diff)
downloadbcm5719-llvm-24284afa2d97401743d664f39a5faf00db7d6afd.tar.gz
bcm5719-llvm-24284afa2d97401743d664f39a5faf00db7d6afd.zip
Flip the default for showing include stacks on notes to false. This
required modifying a few tests that specifically use note include stacks to check the source manager's view of include stacks. I've simply added the flag to these tests for now, they may have to be more substantially changed if we decide to remove support for note include stacks altogether. Also, add a test for include stacks on notes that was supposed to go in with the previous commit. llvm-svn: 128390
Diffstat (limited to 'clang/test/ASTMerge/var.c')
-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 7f23b9f5d26..e1dde6abd2a 100644
--- a/clang/test/ASTMerge/var.c
+++ b/clang/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 %s 2>&1 | FileCheck %s
+// 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
// 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 **'
OpenPOWER on IntegriCloud