Merge pull request #2989 from yosefe/topic/test-ib-fix-odp-xfer-excee…

…ded-err TEST/IB: Re-enable ODP tests, and flush sender iface to fix err syndrome
openucx · Nov 15, 2018 · 4902277 · 4902277
2 parents be61891 + 592a445
commit 4902277
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/test/gtest/uct/ib/test_ib_xfer.cc b/test/gtest/uct/ib/test_ib_xfer.cc
@@ -48,9 +48,6 @@ class uct_p2p_rma_test_alloc_methods : public uct_p2p_rma_test {
 UCS_TEST_P(uct_p2p_rma_test_alloc_methods, xfer_reg_odp,
            "REG_METHODS=odp,direct")
 {
-#if defined(__powerpc64__) || defined(__aarch64__)
-    UCS_TEST_SKIP_R("odp on ppc64/aarch64");
-#endif
     test_put_zcopy();
     test_get_zcopy();
 }
@@ -75,11 +72,8 @@ UCT_INSTANTIATE_IB_TEST_CASE(uct_p2p_rma_test_alloc_methods)
 class uct_p2p_mix_test_alloc_methods : public uct_p2p_mix_test {};
 
 UCS_TEST_P(uct_p2p_mix_test_alloc_methods, mix1000_odp,
-           "REG_METHODS=odp,direct")
+           "REG_METHODS=odp,direct", "DM_COUNT?=0")
 {
-#if defined(__powerpc64__) || defined(__aarch64__)
-    UCS_TEST_SKIP_R("odp on ppc64");
-#endif
     run(1000);
 }
 

diff --git a/test/gtest/uct/test_p2p_mix.cc b/test/gtest/uct/test_p2p_mix.cc
@@ -155,6 +155,8 @@ void uct_p2p_mix_test::run(unsigned count) {
     for (unsigned i = 0; i < count; ++i) {
         random_op(sendbuf, recvbuf);
     }
+
+    sender().flush();
 }
 
 void uct_p2p_mix_test::init() {

diff --git a/test/gtest/uct/uct_p2p_test.cc b/test/gtest/uct/uct_p2p_test.cc
@@ -166,6 +166,7 @@ void uct_p2p_test::test_xfer_multi(send_func_t send, size_t min_length,
                                  (uct_memory_type_t) mem_type);
     }
 }
+
 void uct_p2p_test::test_xfer_multi_mem_type(send_func_t send, size_t min_length,
                                             size_t max_length, unsigned flags,
                                             uct_memory_type_t mem_type) {