From 5165b7de6592f88639e7c4d22fb63e33d1e6d9cf Mon Sep 17 00:00:00 2001 From: Chuck Atkins <chuck.atkins@kitware.com> Date: Wed, 31 May 2017 13:37:58 -0400 Subject: [PATCH] Add google test cases as CTest tests --- testing/CMakeLists.txt | 2 ++ testing/adios2/engine/adios1/CMakeLists.txt | 2 +- testing/adios2/engine/bp/CMakeLists.txt | 2 +- testing/adios2/engine/hdf5/CMakeLists.txt | 2 +- testing/adios2/interface/CMakeLists.txt | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index 80385077f..7ed0bbbc8 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -3,4 +3,6 @@ # accompanying file Copyright.txt for details. #------------------------------------------------------------------------------# +include(GoogleTest) + add_subdirectory(adios2) diff --git a/testing/adios2/engine/adios1/CMakeLists.txt b/testing/adios2/engine/adios1/CMakeLists.txt index e71473103..35fd48db9 100644 --- a/testing/adios2/engine/adios1/CMakeLists.txt +++ b/testing/adios2/engine/adios1/CMakeLists.txt @@ -10,5 +10,5 @@ if(NOT ADIOS_USE_MPI) add_executable(TestADIOS1WriteRead TestADIOS1WriteRead.cpp) target_link_libraries(TestADIOS1WriteRead adios2 gtest adios1::adios) - add_test(NAME adios2::engine::adios1::write_read COMMAND TestADIOS1WriteRead) + gtest_add_tests(TARGET TestADIOS1WriteRead) endif() diff --git a/testing/adios2/engine/bp/CMakeLists.txt b/testing/adios2/engine/bp/CMakeLists.txt index 87eb336a2..270f0171c 100644 --- a/testing/adios2/engine/bp/CMakeLists.txt +++ b/testing/adios2/engine/bp/CMakeLists.txt @@ -10,5 +10,5 @@ if(NOT ADIOS_USE_MPI) add_executable(TestBPWriteRead TestBPWriteRead.cpp) target_link_libraries(TestBPWriteRead adios2 gtest adios1::adios) - add_test(NAME adios2::engine::bp::write_read COMMAND TestBPWriteRead) + gtest_add_tests(TARGET TestBPWriteRead) endif() diff --git a/testing/adios2/engine/hdf5/CMakeLists.txt b/testing/adios2/engine/hdf5/CMakeLists.txt index 2f69ed7a3..9847eaee6 100644 --- a/testing/adios2/engine/hdf5/CMakeLists.txt +++ b/testing/adios2/engine/hdf5/CMakeLists.txt @@ -9,4 +9,4 @@ add_executable(TestHDF5WriteRead TestHDF5WriteRead.cpp) target_include_directories(TestHDF5WriteRead PRIVATE ${HDF5_C_INCLUDE_DIRS}) target_link_libraries(TestHDF5WriteRead adios2 gtest ${HDF5_C_LIBRARIES}) -add_test(NAME adios2::engine::hdf5::write_read COMMAND TestHDF5WriteRead) +gtest_add_tests(TARGET TestHDF5WriteRead) diff --git a/testing/adios2/interface/CMakeLists.txt b/testing/adios2/interface/CMakeLists.txt index 7924344f3..e229416de 100644 --- a/testing/adios2/interface/CMakeLists.txt +++ b/testing/adios2/interface/CMakeLists.txt @@ -5,4 +5,5 @@ add_executable(TestADIOSInterfaceWrite TestADIOSInterfaceWrite.cpp) target_link_libraries(TestADIOSInterfaceWrite adios2 gtest gtest_main) -add_test(NAME adios2::interface::write COMMAND TestADIOSInterfaceWrite) + +gtest_add_tests(TARGET TestADIOSInterfaceWrite) -- GitLab