diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-07-12 22:30:03 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2013-07-12 22:30:03 +0000 |
| commit | 8ade08edba4a4d4d64dfdfe6176935353d3c8d8f (patch) | |
| tree | c29b98967265411a7deb5e7bd67fc0fc76beba33 /clang/test/ASTMerge | |
| parent | 021c8ded04ece2830fc7d385c4f5f02ea40f4701 (diff) | |
| download | bcm5719-llvm-8ade08edba4a4d4d64dfdfe6176935353d3c8d8f.tar.gz bcm5719-llvm-8ade08edba4a4d4d64dfdfe6176935353d3c8d8f.zip | |
Changes so that a few tests do not fail when running under guarded malloc.
Guarded malloc emits some messages at the beginning in stderr when enabled.
These messages caused a few tests to fail.
llvm-svn: 186219
Diffstat (limited to 'clang/test/ASTMerge')
| -rw-r--r-- | clang/test/ASTMerge/class.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/ASTMerge/class.cpp b/clang/test/ASTMerge/class.cpp index 885b65e983a..7b31187c469 100644 --- a/clang/test/ASTMerge/class.cpp +++ b/clang/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 |
