@@ -37,17 +37,19 @@ struct numa_nodes_test : ::umf_test::test {
37
37
struct numa_memspace_test : ::numa_nodes_test {
38
38
void SetUp () override {
39
39
::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
+ }
45
46
}
46
47
47
48
void TearDown () override {
48
49
::numa_nodes_test::TearDown ();
49
-
50
- umfMemspaceDestroy (memspace);
50
+ if (memspace) {
51
+ umfMemspaceDestroy (memspace);
52
+ }
51
53
}
52
54
53
55
umf_memspace_handle_t memspace = nullptr ;
@@ -56,17 +58,19 @@ struct numa_memspace_test : ::numa_nodes_test {
56
58
struct numa_memspace_provider_test : ::numa_memspace_test {
57
59
void SetUp () override {
58
60
::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
+ }
64
67
}
65
68
66
69
void TearDown () override {
67
70
::numa_memspace_test::TearDown ();
68
-
69
- umfMemoryProviderDestroy (provider);
71
+ if (provider) {
72
+ umfMemoryProviderDestroy (provider);
73
+ }
70
74
}
71
75
72
76
umf_memory_provider_handle_t provider = nullptr ;
0 commit comments