Skip to content

Commit 6503c1c

Browse files
authored
Merge pull request #134 from ldorau/Fix_skipping_memspace_numa_tests
Fix skipping memspace_numa tests
2 parents 58f5163 + 79e68e9 commit 6503c1c

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

test/memspace_numa.cpp

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,19 @@ struct numa_nodes_test : ::umf_test::test {
3737
struct numa_memspace_test : ::numa_nodes_test {
3838
void SetUp() override {
3939
::numa_nodes_test::SetUp();
40-
41-
enum umf_result_t ret = umfMemspaceCreateFromNumaArray(
42-
nodeIds.data(), nodeIds.size(), &memspace);
43-
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
44-
ASSERT_NE(memspace, nullptr);
40+
if (nodeIds.size()) {
41+
enum umf_result_t ret = umfMemspaceCreateFromNumaArray(
42+
nodeIds.data(), nodeIds.size(), &memspace);
43+
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
44+
ASSERT_NE(memspace, nullptr);
45+
}
4546
}
4647

4748
void TearDown() override {
4849
::numa_nodes_test::TearDown();
49-
50-
umfMemspaceDestroy(memspace);
50+
if (memspace) {
51+
umfMemspaceDestroy(memspace);
52+
}
5153
}
5254

5355
umf_memspace_handle_t memspace = nullptr;
@@ -56,17 +58,19 @@ struct numa_memspace_test : ::numa_nodes_test {
5658
struct numa_memspace_provider_test : ::numa_memspace_test {
5759
void SetUp() override {
5860
::numa_memspace_test::SetUp();
59-
60-
umf_result_t ret =
61-
umfMemoryProviderCreateFromMemspace(memspace, nullptr, &provider);
62-
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
63-
ASSERT_NE(provider, nullptr);
61+
if (nodeIds.size()) {
62+
umf_result_t ret = umfMemoryProviderCreateFromMemspace(
63+
memspace, nullptr, &provider);
64+
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
65+
ASSERT_NE(provider, nullptr);
66+
}
6467
}
6568

6669
void TearDown() override {
6770
::numa_memspace_test::TearDown();
68-
69-
umfMemoryProviderDestroy(provider);
71+
if (provider) {
72+
umfMemoryProviderDestroy(provider);
73+
}
7074
}
7175

7276
umf_memory_provider_handle_t provider = nullptr;

0 commit comments

Comments
 (0)