utilize new SundialsCreateTestName macro

LLNL · Aug 1, 2023 · 187536f · 187536f
1 parent 1c4386b
commit 187536f
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 150 deletions.
diff --git a/examples/arkode/C_manyvector/CMakeLists.txt b/examples/arkode/C_manyvector/CMakeLists.txt
@@ -43,20 +43,30 @@ foreach(example_tuple ${ARKODE_examples})
     PARAMS_VAR example_args
     TYPE_VAR example_type
   ) 
-  # example source files
-  add_executable(${example} ${example})
+  # check if this example has already been added, only need to add
+  # example source files once for testing with different inputs
+  if(NOT TARGET ${example})
+    # example source files
+    add_executable(${example} ${example})
+
+    # folder to organize targets in an IDE
+    set_target_properties(${example} PROPERTIES FOLDER "Examples")
+
+    # libraries to link against
+    target_link_libraries(${example} ${SUNDIALS_LIBS})
+  endif()
+
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
   # add example to regression tests
   sundials_add_test(${example} ${example}
     ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
     ANSWER_FILE ${example}.out
     EXAMPLE_TYPE ${example_type})
 
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
 endforeach(example_tuple ${ARKODE_examples})
 
 # create Makfile and CMakeLists.txt for examples

diff --git a/examples/arkode/C_serial/CMakeLists.txt b/examples/arkode/C_serial/CMakeLists.txt
@@ -140,11 +140,8 @@ foreach(example_tuple ${ARKODE_examples})
   endif()
 
   # check if example args are provided and set the test name
-  if("${example_args}" STREQUAL "")
-    set(test_name ${example})
-  else()
-    string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-  endif()
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
   # add example to regression tests
   sundials_add_test(${test_name} ${example}
@@ -167,23 +164,30 @@ if(BUILD_SUNLINSOL_KLU)
       TYPE_VAR example_type
     ) 
 
-    # example source files
-    add_executable(${example} ${example})
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
+    if (NOT TARGET ${example})
+      # example source files
+      add_executable(${example} ${example})
 
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
+      # folder for IDEs
+      set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # libraries to link against
     target_link_libraries(${example}
       sundials_arkode
       sundials_nvecserial
       sundials_sunlinsolklu
       ${EXE_EXTRA_LINK_LIBS})
+    endif()
+
+    # check if example args are provided and set the test name
+    sundials_create_test_name(${example} test_name
+      TEST_ARGS ${example_args})
+
+    # add example to regression tests
+    sundials_add_test(${example} ${example}
+      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+      ANSWER_FILE ${example}.out
+      EXAMPLE_TYPE ${example_type})
 
   endforeach(example_tuple ${ARKODE_examples_KLU})
 
@@ -202,23 +206,30 @@ if(BUILD_SUNLINSOL_SUPERLUMT)
       TYPE_VAR example_type
     ) 
 
+  if (NOT TARGET ${example})
     # example source files
     add_executable(${example} ${example})
 
+    # folder for IDEs
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
     # libraries to link against
     target_link_libraries(${example}
       sundials_arkode
       sundials_nvecserial
       sundials_sunlinsolsuperlumt
       ${EXE_EXTRA_LINK_LIBS})
+  endif()
+
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+  TEST_ARGS ${example_args})
+
+  # add example to regression tests
+  sundials_add_test(${example} ${example}
+    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+    ANSWER_FILE ${example}.out
+    EXAMPLE_TYPE ${example_type})
 
   endforeach(example_tuple ${ARKODE_examples_SUPERLUMT})
 

diff --git a/examples/cvode/serial/CMakeLists.txt b/examples/cvode/serial/CMakeLists.txt
@@ -102,11 +102,8 @@ foreach(example_tuple ${CVODE_examples})
   endif()
 
   # check if example args are provided and set the test name
-  if("${example_args}" STREQUAL "")
-    set(test_name ${example})
-  else()
-    string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-  endif()
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
   # add example to regression tests
   sundials_add_test(${test_name} ${example}
@@ -153,12 +150,9 @@ if(BUILD_SUNLINSOL_LAPACKBAND AND BUILD_SUNLINSOL_LAPACKDENSE)
       target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLLAPACK_LIBS})
     endif()
 
-    # check if example args are provided and set the test name
-    if("${example_args}" STREQUAL "")
-      set(test_name ${example})
-    else()
-      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-    endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
     # add example to regression tests
     sundials_add_test(${test_name} ${example}
@@ -205,12 +199,9 @@ if(BUILD_SUNLINSOL_KLU)
       target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLKLU_LIBS})
     endif()
 
-    # check if example args are provided and set the test name
-    if("${example_args}" STREQUAL "")
-      set(test_name ${example})
-    else()
-      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-    endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
     # add example to regression tests
     sundials_add_test(${test_name} ${example}
@@ -257,12 +248,9 @@ if(BUILD_SUNLINSOL_SUPERLUMT)
       target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLSLUMT_LIBS})
     endif()
 
-    # check if example args are provided and set the test name
-    if("${example_args}" STREQUAL "")
-      set(test_name ${example})
-    else()
-      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-    endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
     # Do not include SuperLUMT examples in testing when the indextype is int64_t.
     # Answer files were generated with int32_t and minor differences in output

diff --git a/examples/cvodes/serial/CMakeLists.txt b/examples/cvodes/serial/CMakeLists.txt
@@ -115,11 +115,8 @@ foreach(example_tuple ${CVODES_examples})
   endif()
 
   # check if example args are provided and set the test name
-  if("${example_args}" STREQUAL "")
-    set(test_name ${example})
-  else()
-    string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-  endif()
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
   # add example to regression tests
   sundials_add_test(${test_name} ${example}
@@ -166,12 +163,9 @@ if(BUILD_SUNLINSOL_LAPACKBAND AND BUILD_SUNLINSOL_LAPACKDENSE)
       target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLLAPACK_LIBS})
     endif()
 
-    # check if example args are provided and set the test name
-    if("${example_args}" STREQUAL "")
-      set(test_name ${example})
-    else()
-      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-    endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
     # add example to regression tests
     sundials_add_test(${test_name} ${example}
@@ -217,12 +211,9 @@ if(BUILD_SUNLINSOL_KLU)
       target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLKLU_LIBS})
     endif()
 
-    # check if example args are provided and set the test name
-    if("${example_args}" STREQUAL "")
-      set(test_name ${example})
-    else()
-      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-    endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
     # add example to regression tests
     sundials_add_test(${test_name} ${example}
@@ -268,13 +259,9 @@ if(BUILD_SUNLINSOL_SUPERLUMT)
       # libraries to link against
       target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLSLUMT_LIBS})
     endif()
-
-    # check if example args are provided and set the test name
-    if("${example_args}" STREQUAL "")
-      set(test_name ${example})
-    else()
-      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-    endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
     # Do not include SuperLUMT examples in testing when the indextype is int32_t.
     # Answer files were generated with int64_t and minor differences in output

diff --git a/examples/ida/parallel/CMakeLists.txt b/examples/ida/parallel/CMakeLists.txt
@@ -52,25 +52,30 @@ foreach(example_tuple ${IDA_examples})
     TYPE_VAR example_type
   ) 
 
-  # example source files
-  add_executable(${example} ${example})
+  if(NOT TARGET ${example})
+    # example source files
+    add_executable(${example} ${example})
 
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
+    set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
+    # libraries to link against
+    target_link_libraries(${example} ${SUNDIALS_LIBS})
+
+    if(NOT MPI_C_COMPILER)
+      target_link_libraries(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+    endif()
+  endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+  TEST_ARGS ${example_args} MPI_NPROCS ${number_of_tasks})
+
   # add example to regression tests
-  sundials_add_test(${example} ${example}
+  sundials_add_test(${test_name} ${example}
     MPI_NPROCS ${number_of_tasks}
     ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
     ANSWER_FILE ${example}.out
     EXAMPLE_TYPE ${example_type})
 
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-  if(NOT MPI_C_COMPILER)
-    target_link_libraries(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-  endif()
-
 endforeach(example_tuple ${IDA_examples})
 
 # create Makfile and CMakeLists.txt for examples

diff --git a/examples/idas/serial/CMakeLists.txt b/examples/idas/serial/CMakeLists.txt
@@ -94,11 +94,8 @@ foreach(example_tuple ${IDAS_examples})
   endif()
 
   # check if example args are provided and set the test name
-  if("${example_args}" STREQUAL "")
-    set(test_name ${example})
-  else()
-    string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-  endif()
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
   # add example to regression tests
   sundials_add_test(${test_name} ${example}
@@ -145,12 +142,9 @@ if(BUILD_SUNLINSOL_LAPACKBAND AND BUILD_SUNLINSOL_LAPACKDENSE)
       target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLLAPACK_LIBS})
     endif()
 
-    # check if example args are provided and set the test name
-    if("${example_args}" STREQUAL "")
-      set(test_name ${example})
-    else()
-      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-    endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
     # add example to regression tests
     sundials_add_test(${test_name} ${example}
@@ -197,12 +191,9 @@ if(BUILD_SUNLINSOL_KLU)
       target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLKLU_LIBS})
     endif()
 
-    # check if example args are provided and set the test name
-    if("${example_args}" STREQUAL "")
-      set(test_name ${example})
-    else()
-      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-    endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
     # add example to regression tests
     sundials_add_test(${test_name} ${example}
@@ -249,12 +240,9 @@ if(BUILD_SUNLINSOL_SUPERLUMT)
       target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLSLUMT_LIBS})
     endif()
 
-    # check if example args are provided and set the test name
-    if("${example_args}" STREQUAL "")
-      set(test_name ${example})
-    else()
-      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
-    endif()
+  # check if example args are provided and set the test name
+  sundials_create_test_name(${example} test_name
+    TEST_ARGS ${example_args})
 
     # Do not include SuperLUMT examples in testing when the indextype is int64_t.
     # Answer files were generated with int32_t and minor differences in output