Author: rnk Date: Tue May 14 13:01:03 2019 New Revision: 360705 URL: http://llvm.org/viewvc/llvm-project?rev=360705&view=rev Log: Fix ASTMerge/namespace/test.cpp after r360701
Modified: cfe/trunk/test/ASTMerge/namespace/test.cpp Modified: cfe/trunk/test/ASTMerge/namespace/test.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ASTMerge/namespace/test.cpp?rev=360705&r1=360704&r2=360705&view=diff ============================================================================== --- cfe/trunk/test/ASTMerge/namespace/test.cpp (original) +++ cfe/trunk/test/ASTMerge/namespace/test.cpp Tue May 14 13:01:03 2019 @@ -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); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits