[llvm] 95612af - [ORC] Use GTEST_SKIP in ORC C-API unit test.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Fri May 21 10:15:54 PDT 2021
Author: Lang Hames
Date: 2021-05-21T10:15:05-07:00
New Revision: 95612afc1d69ff470943b10210bb902fa14fc4e8
URL: https://github.com/llvm/llvm-project/commit/95612afc1d69ff470943b10210bb902fa14fc4e8
DIFF: https://github.com/llvm/llvm-project/commit/95612afc1d69ff470943b10210bb902fa14fc4e8.diff
LOG: [ORC] Use GTEST_SKIP in ORC C-API unit test.
Now that gtest has been updated to 1.10 which supports GTEST_SKIP, we can use
that over return;
Patch by Mats Larsen. Thanks Mats!
Reviewed By: lhames, ikudrin
Differential Revision: https://reviews.llvm.org/D102710
Added:
Modified:
llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
Removed:
################################################################################
diff --git a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
index f94b954b10104..8b208d8082382 100644
--- a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
@@ -88,7 +88,7 @@ class OrcCAPITestBase : public testing::Test {
void SetUp() override {
if (!TargetSupported)
- return;
+ GTEST_SKIP();
LLVMOrcJITTargetMachineBuilderRef JTMB = nullptr;
LLVMErrorRef E1 = LLVMOrcJITTargetMachineBuilderDetectHost(&JTMB);
@@ -219,11 +219,6 @@ static std::string toString(LLVMErrorRef E) {
}
TEST_F(OrcCAPITestBase, SymbolStringPoolUniquing) {
- if (!Jit) {
- // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
- return;
- }
-
LLVMOrcSymbolStringPoolEntryRef E1 =
LLVMOrcExecutionSessionIntern(ExecutionSession, "aaa");
LLVMOrcSymbolStringPoolEntryRef E2 =
@@ -240,10 +235,6 @@ TEST_F(OrcCAPITestBase, SymbolStringPoolUniquing) {
}
TEST_F(OrcCAPITestBase, JITDylibLookup) {
- if (!Jit) {
- // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
- return;
- }
LLVMOrcJITDylibRef DoesNotExist =
LLVMOrcExecutionSessionGetJITDylibByName(ExecutionSession, "test");
ASSERT_FALSE(!!DoesNotExist);
@@ -255,11 +246,6 @@ TEST_F(OrcCAPITestBase, JITDylibLookup) {
}
TEST_F(OrcCAPITestBase, MaterializationUnitCreation) {
- if (!Jit) {
- // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
- return;
- }
-
LLVMOrcSymbolStringPoolEntryRef Name =
LLVMOrcLLJITMangleAndIntern(Jit, "test");
LLVMJITSymbolFlags Flags = {LLVMJITSymbolGenericFlagsWeak, 0};
@@ -278,11 +264,6 @@ TEST_F(OrcCAPITestBase, MaterializationUnitCreation) {
}
TEST_F(OrcCAPITestBase, DefinitionGenerators) {
- if (!Jit) {
- // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
- return;
- }
-
LLVMOrcDefinitionGeneratorRef Gen =
LLVMOrcCreateCustomCAPIDefinitionGenerator(&definitionGeneratorFn,
nullptr);
@@ -297,11 +278,6 @@ TEST_F(OrcCAPITestBase, DefinitionGenerators) {
}
TEST_F(OrcCAPITestBase, ResourceTrackerDefinitionLifetime) {
- if (!Jit) {
- // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
- return;
- }
-
// This test case ensures that all symbols loaded into a JITDylib with a
// ResourceTracker attached are cleared from the JITDylib once the RT is
// removed.
@@ -327,11 +303,6 @@ TEST_F(OrcCAPITestBase, ResourceTrackerDefinitionLifetime) {
}
TEST_F(OrcCAPITestBase, ResourceTrackerTransfer) {
- if (!Jit) {
- // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
- return;
- }
-
LLVMOrcResourceTrackerRef DefaultRT =
LLVMOrcJITDylibGetDefaultResourceTracker(MainDylib);
LLVMOrcResourceTrackerRef RT2 =
@@ -351,11 +322,6 @@ TEST_F(OrcCAPITestBase, ResourceTrackerTransfer) {
}
TEST_F(OrcCAPITestBase, AddObjectBuffer) {
- if (!Jit) {
- // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
- return;
- }
-
LLVMOrcObjectLayerRef ObjLinkingLayer = LLVMOrcLLJITGetObjLinkingLayer(Jit);
LLVMMemoryBufferRef ObjBuffer = createTestObject(SumExample, "sum.ll");
@@ -372,11 +338,6 @@ TEST_F(OrcCAPITestBase, AddObjectBuffer) {
}
TEST_F(OrcCAPITestBase, ExecutionTest) {
- if (!Jit) {
- // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
- return;
- }
-
using SumFunctionType = int32_t (*)(int32_t, int32_t);
// This test performs OrcJIT compilation of a simple sum module
More information about the llvm-commits
mailing list