fix test exclusion expressions

ornladios · Nov 13, 2023 · 1847e39 · 1847e39
1 parent 1e3b2d2
commit 1847e39
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 32 deletions.
diff --git a/scripts/ci/cmake/ci-ubuntu20.04-clang10-mpich.cmake b/scripts/ci/cmake/ci-ubuntu20.04-clang10-mpich.cmake
@@ -41,12 +41,8 @@ MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 
 # TODO: The Kill* and PreciousTimeStep tests fail (due to timeout) when
 # TODO: adios2 is built "--with-device=ch3:sock:tcp".  Once this is fixed
-# TODO:  in the mpi_dp, we can re-enable these tests.
-list(APPEND EXCLUDE_EXPRESSIONS
-  "KillReader"
-  "KillWriter"
-  "PreciousTimeStep")
-list(JOIN EXCLUDE_EXPRESSIONS "|" CTEST_TEST_ARGS)
+# TODO: in the mpi_dp, we can re-enable these tests.
+set(CTEST_TEST_ARGS EXCLUDE "KillReader|KillWriter|PreciousTimeStep")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-clang6-mpich.cmake b/scripts/ci/cmake/ci-ubuntu20.04-clang6-mpich.cmake
@@ -40,16 +40,11 @@ CMAKE_Fortran_FLAGS:STRING=-Wall
 MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
-# We have a dedicated build for this setup without MPI, so we exclude ".Serial$"
+# We have a dedicated build for clang6 + serial, so we exclude ".Serial$"
 # TODO: The Kill* and PreciousTimeStep tests fail (due to timeout) when
 # TODO: adios2 is built "--with-device=ch3:sock:tcp".  Once this is fixed
 # TODO:  in the mpi_dp, we can re-enable these tests.
-list(APPEND EXCLUDE_EXPRESSIONS
-  ".Serial$"
-  "KillReader"
-  "KillWriter"
-  "PreciousTimeStep")
-list(JOIN EXCLUDE_EXPRESSIONS "|" CTEST_TEST_ARGS)
+set(CTEST_TEST_ARGS EXCLUDE "KillReader|KillWriter|PreciousTimeStep|.Serial$")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-gcc10-mpich.cmake b/scripts/ci/cmake/ci-ubuntu20.04-gcc10-mpich.cmake
@@ -45,11 +45,11 @@ MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 list(APPEND EXCLUDE_EXPRESSIONS
   "Engine.BPEngineTest.SzComplex.MPI"
   "Engine.BPEngineTest.ZfpComplex.MPI"
-  ".Serial$"
   "KillReader"
   "KillWriter"
   "PreciousTimeStep")
-list(JOIN EXCLUDE_EXPRESSIONS "|" CTEST_TEST_ARGS)
+list(JOIN EXCLUDE_EXPRESSIONS "|" TEST_EXCLUDE_STRING)
+set(CTEST_TEST_ARGS EXCLUDE "$TEST_EXCLUDE_STRING")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-gcc11-mpich.cmake b/scripts/ci/cmake/ci-ubuntu20.04-gcc11-mpich.cmake
@@ -42,11 +42,7 @@ MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 # TODO: The Kill* and PreciousTimeStep tests fail (due to timeout) when
 # TODO: adios2 is built "--with-device=ch3:sock:tcp".  Once this is fixed
 # TODO:  in the mpi_dp, we can re-enable these tests.
-list(APPEND EXCLUDE_EXPRESSIONS
-  "KillReader"
-  "KillWriter"
-  "PreciousTimeStep")
-list(JOIN EXCLUDE_EXPRESSIONS "|" CTEST_TEST_ARGS)
+set(CTEST_TEST_ARGS EXCLUDE "KillReader|KillWriter|PreciousTimeStep")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-gcc8-mpich.cmake b/scripts/ci/cmake/ci-ubuntu20.04-gcc8-mpich.cmake
@@ -39,16 +39,11 @@ CMAKE_Fortran_FLAGS:STRING=-Wall
 MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
-# We have a dedicated build for gcc8+serial already, so skip those here
+# We have a dedicated build for gcc8 + serial, so we exclude ".Serial$"
 # TODO: The Kill* and PreciousTimeStep tests fail (due to timeout) when
 # TODO: adios2 is built "--with-device=ch3:sock:tcp".  Once this is fixed
 # TODO:  in the mpi_dp, we can re-enable these tests.
-list(APPEND EXCLUDE_EXPRESSIONS
-  ".Serial$"
-  "KillReader"
-  "KillWriter"
-  "PreciousTimeStep")
-list(JOIN EXCLUDE_EXPRESSIONS "|" CTEST_TEST_ARGS)
+set(CTEST_TEST_ARGS EXCLUDE "KillReader|KillWriter|PreciousTimeStep|.Serial$")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")

diff --git a/scripts/ci/cmake/ci-ubuntu20.04-gcc9-mpich.cmake b/scripts/ci/cmake/ci-ubuntu20.04-gcc9-mpich.cmake
@@ -42,11 +42,7 @@ MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 # TODO: The Kill* and PreciousTimeStep tests fail (due to timeout) when
 # TODO: adios2 is built "--with-device=ch3:sock:tcp".  Once this is fixed
 # TODO:  in the mpi_dp, we can re-enable these tests.
-list(APPEND EXCLUDE_EXPRESSIONS
-  "KillReader"
-  "KillWriter"
-  "PreciousTimeStep")
-list(JOIN EXCLUDE_EXPRESSIONS "|" CTEST_TEST_ARGS)
+set(CTEST_TEST_ARGS EXCLUDE "KillReader|KillWriter|PreciousTimeStep")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")