From fb2efeb80491cb0f270bf643944cf4bc11f4e3f2 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Thu, 30 Jun 2016 20:29:29 +0000 Subject: [PATCH] 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. llvm-svn: 274269 --- clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp b/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp index bf2c08a5aa97..6c8a5e000f49 100644 --- a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp +++ b/clang/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));