Merge pull request #258 from HaochengLIU/Make-hdf5-test-run-in-parallel

Testing: Make hdf5 test able to run in parallel and guard BP engine tests

testing/adios2/engine/bp/CMakeLists.txt

@@ -5,47 +5,49 @@
 
 # MPI versions of the test are not properly implemented at the moment
 
-add_executable(TestBPWriteRead TestBPWriteRead.cpp)
-target_link_libraries(TestBPWriteRead adios2 gtest adios1::adios)
+if (ADIOS2_HAVE_ADIOS1)
+  add_executable(TestBPWriteRead TestBPWriteRead.cpp)
+  target_link_libraries(TestBPWriteRead adios2 gtest adios1::adios)
 
-add_executable(TestBPWriteReadAttributes TestBPWriteReadAttributes.cpp)
-target_link_libraries(TestBPWriteReadAttributes adios2 gtest adios1::adios)
+  add_executable(TestBPWriteReadAttributes TestBPWriteReadAttributes.cpp)
+  target_link_libraries(TestBPWriteReadAttributes adios2 gtest adios1::adios)
 
-add_executable(TestBPWriteReadstdio TestBPWriteReadstdio.cpp)
-target_link_libraries(TestBPWriteReadstdio adios2 gtest adios1::adios)
+  add_executable(TestBPWriteReadstdio TestBPWriteReadstdio.cpp)
+  target_link_libraries(TestBPWriteReadstdio adios2 gtest adios1::adios)
 
-add_executable(TestBPWriteReadfstream TestBPWriteReadfstream.cpp)
-target_link_libraries(TestBPWriteReadfstream adios2 gtest adios1::adios)
+  add_executable(TestBPWriteReadfstream TestBPWriteReadfstream.cpp)
+  target_link_libraries(TestBPWriteReadfstream adios2 gtest adios1::adios)
 
-add_executable(TestBPWriteProfilingJSON TestBPWriteProfilingJSON.cpp)
-target_link_libraries(TestBPWriteProfilingJSON
-  adios2 gtest NLohmannJson
-)
+  add_executable(TestBPWriteProfilingJSON TestBPWriteProfilingJSON.cpp)
+  target_link_libraries(TestBPWriteProfilingJSON
+    adios2 gtest NLohmannJson
+  )
 
-if(ADIOS2_HAVE_MPI)
-  target_include_directories(TestBPWriteRead PRIVATE ${MPI_C_INCLUDE_PATH})
-  target_link_libraries(TestBPWriteRead ${MPI_C_LIBRARIES})
+  if(ADIOS2_HAVE_MPI)
+    target_include_directories(TestBPWriteRead PRIVATE ${MPI_C_INCLUDE_PATH})
+    target_link_libraries(TestBPWriteRead ${MPI_C_LIBRARIES})
 
-  target_include_directories(TestBPWriteReadAttributes PRIVATE ${MPI_C_INCLUDE_PATH})
-  target_link_libraries(TestBPWriteReadAttributes ${MPI_C_LIBRARIES})
+    target_include_directories(TestBPWriteReadAttributes PRIVATE ${MPI_C_INCLUDE_PATH})
+    target_link_libraries(TestBPWriteReadAttributes ${MPI_C_LIBRARIES})
 
-  target_include_directories(TestBPWriteReadstdio PRIVATE ${MPI_C_INCLUDE_PATH})
-  target_link_libraries(TestBPWriteReadstdio ${MPI_C_LIBRARIES})
+    target_include_directories(TestBPWriteReadstdio PRIVATE ${MPI_C_INCLUDE_PATH})
+    target_link_libraries(TestBPWriteReadstdio ${MPI_C_LIBRARIES})
 
-  target_include_directories(TestBPWriteReadfstream PRIVATE ${MPI_C_INCLUDE_PATH})
-  target_link_libraries(TestBPWriteReadfstream ${MPI_C_LIBRARIES})
+    target_include_directories(TestBPWriteReadfstream PRIVATE ${MPI_C_INCLUDE_PATH})
+    target_link_libraries(TestBPWriteReadfstream ${MPI_C_LIBRARIES})
 
-  target_include_directories(TestBPWriteProfilingJSON PRIVATE ${MPI_C_INCLUDE_PATH})
-  target_link_libraries(TestBPWriteProfilingJSON ${MPI_C_LIBRARIES})
+    target_include_directories(TestBPWriteProfilingJSON PRIVATE ${MPI_C_INCLUDE_PATH})
+    target_link_libraries(TestBPWriteProfilingJSON ${MPI_C_LIBRARIES})
 
-  set(extra_test_args
-    EXEC_WRAPPER
-      ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS}
-  )
-endif()
+    set(extra_test_args
+      EXEC_WRAPPER
+        ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS}
+    )
+  endif()
 
-gtest_add_tests(TARGET TestBPWriteRead ${extra_test_args})
-gtest_add_tests(TARGET TestBPWriteReadAttributes ${extra_test_args})
-gtest_add_tests(TARGET TestBPWriteReadstdio ${extra_test_args})
-gtest_add_tests(TARGET TestBPWriteReadfstream ${extra_test_args})
-gtest_add_tests(TARGET TestBPWriteProfilingJSON ${extra_test_args})
+  gtest_add_tests(TARGET TestBPWriteRead ${extra_test_args})
+  gtest_add_tests(TARGET TestBPWriteReadAttributes ${extra_test_args})
+  gtest_add_tests(TARGET TestBPWriteReadstdio ${extra_test_args})
+  gtest_add_tests(TARGET TestBPWriteReadfstream ${extra_test_args})
+  gtest_add_tests(TARGET TestBPWriteProfilingJSON ${extra_test_args})
+endif()

testing/adios2/engine/hdf5/CMakeLists.txt

@@ -13,4 +13,13 @@ else()
 endif()
 target_link_libraries(TestHDF5WriteRead adios2 gtest ${HDF5_C_LIBRARIES})
 
-gtest_add_tests(TARGET TestHDF5WriteRead)
+if(ADIOS2_HAVE_MPI)
+  target_include_directories(TestHDF5WriteRead PRIVATE ${MPI_C_INCLUDE_PATH})
+  target_link_libraries(TestHDF5WriteRead ${MPI_C_LIBRARIES})
+  set(extra_test_args
+    EXEC_WRAPPER
+      ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS}
+  )
+endif()
+
+gtest_add_tests(TARGET TestHDF5WriteRead ${extra_test_args})