summaryrefslogtreecommitdiffstats
path: root/clang/test/ASTMerge/namespace/test.cpp
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2019-05-14 20:01:03 +0000
committerReid Kleckner <rnk@google.com>2019-05-14 20:01:03 +0000
commitdc2f5f9ff81dbc4f963adf023fadea3404d084e5 (patch)
tree22c17effd7d18140582fb4b347ff2f5722945e1d /clang/test/ASTMerge/namespace/test.cpp
parent53c9d585b5b12f72c21ac85baa410a565f4cfbe7 (diff)
downloadbcm5719-llvm-dc2f5f9ff81dbc4f963adf023fadea3404d084e5.tar.gz
bcm5719-llvm-dc2f5f9ff81dbc4f963adf023fadea3404d084e5.zip
Fix ASTMerge/namespace/test.cpp after r360701
llvm-svn: 360705
Diffstat (limited to 'clang/test/ASTMerge/namespace/test.cpp')
-rw-r--r--clang/test/ASTMerge/namespace/test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/ASTMerge/namespace/test.cpp b/clang/test/ASTMerge/namespace/test.cpp
index 5e0d9ee510f..360bca95298 100644
--- a/clang/test/ASTMerge/namespace/test.cpp
+++ b/clang/test/ASTMerge/namespace/test.cpp
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -emit-pch -std=c++1z -o %t.1.ast %S/Inputs/namespace1.cpp
// RUN: %clang_cc1 -emit-pch -std=c++1z -o %t.2.ast %S/Inputs/namespace2.cpp
-// RUN: not %clang_cc1 -std=c++1z -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -std=c++1z -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s
static_assert(TestAliasName::z == 4);
static_assert(ContainsInline::z == 10);
OpenPOWER on IntegriCloud