Merge pull request #257 from HaochengLIU/Interface-tests-in-parallel

Make Interface and HDF5 engine tests able to run in parallel
ornladios · Sep 1, 2017 · 2cf15e6 · 2cf15e6
2 parents 026e192 + fab5162
commit 2cf15e6
Show file tree

Hide file tree

Showing 5 changed files with 1,093 additions and 833 deletions.
diff --git a/testing/adios2/engine/bp/TestBPWriteReadAttributes.cpp b/testing/adios2/engine/bp/TestBPWriteReadAttributes.cpp
@@ -57,7 +57,7 @@ TEST_F(BPWriteReadAttributeTest, ADIOS2BPWriteADIOS1ReadSingleTypes)
     std::string double_Single = std::string("double_Single_") + mpiRankString;
 
     // When collective meta generation has landed, use
-    // generateNewSmallTestData(m_TestData, 0, 0, mpiSize);
+    // generateNewSmallTestData(m_TestData, 0, mpiRank, mpiSize);
     // Generate current testing data
     SmallTestData currentTestData =
         generateNewSmallTestData(m_TestData, 0, 0, 0);

diff --git a/testing/adios2/interface/CMakeLists.txt b/testing/adios2/interface/CMakeLists.txt
@@ -12,6 +12,22 @@ target_link_libraries(TestADIOSDefineVariable adios2 gtest gtest_main)
 add_executable(TestADIOSDefineAttribute TestADIOSDefineAttribute.cpp)
 target_link_libraries(TestADIOSDefineAttribute adios2 gtest gtest_main)
 
-gtest_add_tests(TARGET TestADIOSInterfaceWrite)
-gtest_add_tests(TARGET TestADIOSDefineVariable)
-gtest_add_tests(TARGET TestADIOSDefineAttribute)
+if(ADIOS2_HAVE_MPI)
+  target_include_directories(TestADIOSInterfaceWrite PRIVATE ${MPI_C_INCLUDE_PATH})
+  target_link_libraries(TestADIOSInterfaceWrite ${MPI_C_LIBRARIES})
+
+  target_include_directories(TestADIOSDefineVariable PRIVATE ${MPI_C_INCLUDE_PATH})
+  target_link_libraries(TestADIOSDefineVariable ${MPI_C_LIBRARIES})
+
+  target_include_directories(TestADIOSDefineAttribute PRIVATE ${MPI_C_INCLUDE_PATH})
+  target_link_libraries(TestADIOSDefineAttribute ${MPI_C_LIBRARIES})
+
+  set(extra_test_args
+    EXEC_WRAPPER
+      ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS}
+  )
+endif()
+
+gtest_add_tests(TARGET TestADIOSInterfaceWrite ${extra_test_args})
+gtest_add_tests(TARGET TestADIOSDefineVariable ${extra_test_args})
+gtest_add_tests(TARGET TestADIOSDefineAttribute ${extra_test_args})