Skip to content

Commit 6fe7145

Browse files
committed
Fix skipping memspace_numa tests
Fix skipping memspace_numa tests. GTEST_SKIP() called in numa_nodes_test does not skip numa_memspace_test and numa_memspace_provider_test tests. Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 8ecbefe commit 6fe7145

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

test/memspace_numa.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
struct numa_nodes_test : ::umf_test::test {
1717
void SetUp() override {
1818
::umf_test::test::SetUp();
19+
skip_this_test = 0;
1920

2021
if (numa_available() == -1) {
22+
skip_this_test = 1;
2123
GTEST_SKIP() << "Failed to initialize libnuma";
2224
}
2325

2426
int numNodes = numa_max_node();
2527
if (numNodes < 0) {
28+
skip_this_test = 1;
2629
GTEST_SKIP() << "No available numa nodes";
2730
}
2831

@@ -32,12 +35,17 @@ struct numa_nodes_test : ::umf_test::test {
3235
}
3336

3437
std::vector<size_t> nodeIds;
38+
int skip_this_test;
3539
};
3640

3741
struct numa_memspace_test : ::numa_nodes_test {
3842
void SetUp() override {
3943
::numa_nodes_test::SetUp();
4044

45+
if (skip_this_test) {
46+
GTEST_SKIP();
47+
}
48+
4149
enum umf_result_t ret = umfMemspaceCreateFromNumaArray(
4250
nodeIds.data(), nodeIds.size(), &memspace);
4351
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
@@ -47,6 +55,10 @@ struct numa_memspace_test : ::numa_nodes_test {
4755
void TearDown() override {
4856
::numa_nodes_test::TearDown();
4957

58+
if (skip_this_test) {
59+
GTEST_SKIP();
60+
}
61+
5062
umfMemspaceDestroy(memspace);
5163
}
5264

@@ -57,6 +69,10 @@ struct numa_memspace_provider_test : ::numa_memspace_test {
5769
void SetUp() override {
5870
::numa_memspace_test::SetUp();
5971

72+
if (skip_this_test) {
73+
GTEST_SKIP();
74+
}
75+
6076
umf_result_t ret =
6177
umfMemoryProviderCreateFromMemspace(memspace, nullptr, &provider);
6278
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
@@ -66,6 +82,10 @@ struct numa_memspace_provider_test : ::numa_memspace_test {
6682
void TearDown() override {
6783
::numa_memspace_test::TearDown();
6884

85+
if (skip_this_test) {
86+
GTEST_SKIP();
87+
}
88+
6989
umfMemoryProviderDestroy(provider);
7090
}
7191

0 commit comments

Comments
 (0)