From: Justin Lebar Date: Thu, 30 Jun 2016 20:29:29 +0000 (+0000) Subject: Fix ASTMatchersNodeTest to work on Windows. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f042a1dff80b57583992e3c191c59c2347055fdc;p=clang Fix ASTMatchersNodeTest to work on Windows. It was failing because it had an explicit check for whether we're on Windows. There are a few other similar explicit checks in this file which I didn't remove because they serve as reasonable documentation that the test doesn't work with a Windows triple. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@274269 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/unittests/ASTMatchers/ASTMatchersNodeTest.cpp b/unittests/ASTMatchers/ASTMatchersNodeTest.cpp index bf2c08a5aa..6c8a5e000f 100644 --- a/unittests/ASTMatchers/ASTMatchersNodeTest.cpp +++ b/unittests/ASTMatchers/ASTMatchersNodeTest.cpp @@ -82,13 +82,11 @@ TEST(NameableDeclaration, REMatchesVariousDecls) { TEST(DeclarationMatcher, MatchClass) { DeclarationMatcher ClassMatcher(recordDecl()); - llvm::Triple Triple(llvm::sys::getDefaultTargetTriple()); - if (Triple.getOS() != llvm::Triple::Win32 || - Triple.getEnvironment() != llvm::Triple::MSVC) - EXPECT_FALSE(matches("", ClassMatcher)); - else - // Matches class type_info. - EXPECT_TRUE(matches("", ClassMatcher)); + + // This passes on Windows only because we explicitly pass -target + // i386-unknown-unknown. If we were to compile with the default target + // triple, we'd want to EXPECT_TRUE if it's Win32 or MSVC. + EXPECT_FALSE(matches("", ClassMatcher)); DeclarationMatcher ClassX = recordDecl(recordDecl(hasName("X"))); EXPECT_TRUE(matches("class X;", ClassX));