diff --git a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp --- a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp @@ -220,8 +220,7 @@ TEST_F(OrcCAPITestBase, SymbolStringPoolUniquing) { if (!Jit) { - // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0 - return; + GTEST_SKIP(); } LLVMOrcSymbolStringPoolEntryRef E1 = @@ -241,8 +240,7 @@ TEST_F(OrcCAPITestBase, JITDylibLookup) { if (!Jit) { - // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0 - return; + GTEST_SKIP(); } LLVMOrcJITDylibRef DoesNotExist = LLVMOrcExecutionSessionGetJITDylibByName(ExecutionSession, "test"); @@ -256,8 +254,7 @@ TEST_F(OrcCAPITestBase, MaterializationUnitCreation) { if (!Jit) { - // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0 - return; + GTEST_SKIP(); } LLVMOrcSymbolStringPoolEntryRef Name = @@ -279,8 +276,7 @@ TEST_F(OrcCAPITestBase, DefinitionGenerators) { if (!Jit) { - // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0 - return; + GTEST_SKIP(); } LLVMOrcDefinitionGeneratorRef Gen = @@ -298,8 +294,7 @@ TEST_F(OrcCAPITestBase, ResourceTrackerDefinitionLifetime) { if (!Jit) { - // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0 - return; + GTEST_SKIP(); } // This test case ensures that all symbols loaded into a JITDylib with a @@ -328,8 +323,7 @@ TEST_F(OrcCAPITestBase, ResourceTrackerTransfer) { if (!Jit) { - // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0 - return; + GTEST_SKIP(); } LLVMOrcResourceTrackerRef DefaultRT = @@ -352,8 +346,7 @@ TEST_F(OrcCAPITestBase, AddObjectBuffer) { if (!Jit) { - // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0 - return; + GTEST_SKIP(); } LLVMOrcObjectLayerRef ObjLinkingLayer = LLVMOrcLLJITGetObjLinkingLayer(Jit); @@ -373,8 +366,7 @@ TEST_F(OrcCAPITestBase, ExecutionTest) { if (!Jit) { - // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0 - return; + GTEST_SKIP(); } using SumFunctionType = int32_t (*)(int32_t, int32_t);