summaryrefslogtreecommitdiff
path: root/test/ASTMerge
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
commit34b8e6889a12c90e8053fba8a1ea49b17c05ac51 (patch)
tree08fc411efb2d49194dbd58b6da6499c03cef8c99 /test/ASTMerge
parentf2d74cc083e1a83838acf99d2e1ca260d1c54742 (diff)
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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128390 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge')
-rw-r--r--test/ASTMerge/var.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/ASTMerge/var.c b/test/ASTMerge/var.c
index 7f23b9f5d2..e1dde6abd2 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 %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 **'