From: Ahmed Bougacha Date: Sat, 4 Feb 2017 00:46:59 +0000 (+0000) Subject: [Support] Simplify triple check in Host CPU test. NFC. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dc8838a5b95120993e0c24fbc3da20f757d0f19;p=llvm [Support] Simplify triple check in Host CPU test. NFC. Cleanup the check added in r293990 using the Triple helpers. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294073 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/unittests/Support/Host.cpp b/unittests/Support/Host.cpp index fdeed878128..10f883e6d2c 100644 --- a/unittests/Support/Host.cpp +++ b/unittests/Support/Host.cpp @@ -17,26 +17,17 @@ using namespace llvm; class HostTest : public testing::Test { Triple Host; - SmallVector, 4> SupportedArchAndOSs; protected: bool isSupportedArchAndOS() { - if (is_contained(SupportedArchAndOSs, std::make_pair(Host.getArch(), Host.getOS()))) - return true; - - return false; - } - - HostTest() { - Host.setTriple(Triple::normalize(sys::getProcessTriple())); - // Initially this is only testing detection of the number of // physical cores, which is currently only supported/tested for // x86_64 Linux and Darwin. - SupportedArchAndOSs.push_back(std::make_pair(Triple::x86_64, Triple::Linux)); - SupportedArchAndOSs.push_back(std::make_pair(Triple::x86_64, Triple::Darwin)); - SupportedArchAndOSs.push_back(std::make_pair(Triple::x86_64, Triple::MacOSX)); + return (Host.getArch() == Triple::x86_64 && + (Host.isOSDarwin() || Host.getOS() == Triple::Linux)); } + + HostTest() : Host(Triple::normalize(sys::getProcessTriple())) {} }; TEST_F(HostTest, NumPhysicalCores) {