Resolving a few more merge issues. Now running and passing all 163/163 tests with ctest -R _zero

Author: KADichev

CMakeLists.txt

@@ -176,6 +176,7 @@ if ( LIB_MATH AND LIB_DL AND MPI_FOUND )
 
     if (ENABLE_IBVERBS)
         list(APPEND ENGINES "ibverbs")
+        list(APPEND ENGINES "zero")
     endif()
 
 endif()

src/MPI/CMakeLists.txt

@@ -196,6 +196,10 @@ if (MPI_FOUND)
         add_gtest( ibverbs_test "ibverbs" ON ${CMAKE_CURRENT_SOURCE_DIR}/ibverbs.t.cpp 
             ${CMAKE_CURRENT_SOURCE_DIR}/ibverbs.cpp 
             ${CMAKE_CURRENT_SOURCE_DIR}/mpilib.cpp)
+
+        add_gtest( zero_test "zero" ON ${CMAKE_CURRENT_SOURCE_DIR}/ibverbs.t.cpp 
+            ${CMAKE_CURRENT_SOURCE_DIR}/ibverbsZero.cpp 
+            ${CMAKE_CURRENT_SOURCE_DIR}/mpilib.cpp)
     endif()
 
     foreach (engine ${MPI_ENGINES})

tests/functional/CMakeLists.txt

@@ -141,13 +141,13 @@ foreach (LPF_IMPL_ID ${ENGINES})
         #   zero engine does not support that
         string(REGEX MATCH "overlapping|early|bsplib" foundTest ${testSource})
         if (NOT ${LPF_IMPL_ID} STREQUAL "zero") 
-            add_gtest_mpi(${exeName} ${LPF_IMPL_ID} ${debug}  FALSE "${CMAKE_CURRENT_SOURCE_DIR}/${testSource}")
+            add_gtest(${exeName} ${LPF_IMPL_ID} ${debug} "${CMAKE_CURRENT_SOURCE_DIR}/${testSource}")
 
             string(REGEX REPLACE "(.${LPF_IMPL_ID})?.cpp$" "" baseName ${testSource})
             get_filename_component(baseName ${testSource} NAME_WE  )
             set(exeName "${baseName}_${LPF_IMPL_ID}_${LPF_IMPL_CONFIG}${mode}")
         elseif ("${foundTest}" STREQUAL "")
-            add_gtest_mpi(${exeName} ${LPF_IMPL_ID} ${debug}  FALSE "${CMAKE_CURRENT_SOURCE_DIR}/${testSource}")
+            add_gtest(${exeName} ${LPF_IMPL_ID} ${debug} "${CMAKE_CURRENT_SOURCE_DIR}/${testSource}")
 
             string(REGEX REPLACE "(.${LPF_IMPL_ID})?.cpp$" "" baseName ${testSource})
             get_filename_component(baseName ${testSource} NAME_WE  )

tests/functional/func_lpf_probe_parallel_nested.cpp

@@ -117,8 +117,8 @@ void spmd1( lpf_t lpf, lpf_pid_t pid, lpf_pid_t nprocs, lpf_args_t args)
     EXPECT_LT( 0.0, (*(subMachine.g))(machine.p, (size_t)(-1), LPF_SYNC_DEFAULT) );
     EXPECT_LT( 0.0, (*(subMachine.l))(machine.p, (size_t)(-1), LPF_SYNC_DEFAULT) );
 
-    const int pthread = 1, mpirma = 1, mpimsg = 1, hybrid = 0, ibverbs=1; 
-    (void) pthread; (void) mpirma; (void) mpimsg; (void) hybrid; (void) ibverbs;
+    const int pthread = 1, mpirma = 1, mpimsg = 1, hybrid = 0, ibverbs=1, zero = 1;
+    (void) pthread; (void) mpirma; (void) mpimsg; (void) hybrid; (void) ibverbs; (void) zero;
     if (LPF_CORE_IMPL_ID) // this part is disabled for the hybrid implementation, because
     {                     // that one doesn't do generic nesting of lpf_exec's
         EXPECT_EQ( 1,  subMachine.free_p == 2 || subMachine.free_p == 3 );
@@ -203,5 +203,4 @@ TEST( API, func_lpf_probe_parallel_nested )
 
     rc = lpf_exec( LPF_ROOT, machine.p / 2, &spmd1, args );
     EXPECT_EQ( LPF_SUCCESS, rc );
-
 }