Merge pull request #7211 from dmitrygx/topic/ucp/gtest_wireup_fix

GTEST/UCP/WIREUP: Don't overwrite EP params from base test suite
openucx · Aug 11, 2021 · d745991 · d745991
2 parents 2f541b4 + 370d6e2
commit d745991
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/test/gtest/ucp/test_ucp_wireup.cc b/test/gtest/ucp/test_ucp_wireup.cc
@@ -1471,14 +1471,15 @@ class test_ucp_wireup_keepalive : public test_ucp_wireup {
     }
 
     ucp_ep_params_t get_ep_params() {
-        ucp_ep_params_t params;
-        memset(&params, 0, sizeof(params));
-        params.field_mask      = UCP_EP_PARAM_FIELD_ERR_HANDLING_MODE |
+        ucp_ep_params_t params = test_ucp_wireup::get_ep_params();
+
+        params.field_mask     |= UCP_EP_PARAM_FIELD_ERR_HANDLING_MODE |
                                  UCP_EP_PARAM_FIELD_ERR_HANDLER;
         params.err_mode        = UCP_ERR_HANDLING_MODE_PEER;
         params.err_handler.cb  = reinterpret_cast<ucp_err_handler_cb_t>
                                  (ucs_empty_function);
         params.err_handler.arg = reinterpret_cast<void*>(this);
+
         return params;
     }