From bc37ab9c29c4aa59f20e46e2c0cfb1a92a7a8445 Mon Sep 17 00:00:00 2001
From: "David J. Gardner" <gardner48@llnl.gov>
Date: Wed, 18 Dec 2024 20:12:30 -0800
Subject: [PATCH] update CI cmake options

---
 .github/workflows/ubuntu-clang-latest.yml  | 4 ++--
 .github/workflows/windows-latest-intel.yml | 4 ++--
 .github/workflows/windows-latest-mingw.yml | 4 ++--
 .github/workflows/windows-latest.yml       | 2 +-
 .gitlab/build_and_test.sh                  | 3 ++-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ubuntu-clang-latest.yml b/.github/workflows/ubuntu-clang-latest.yml
index 57b3dfc85e..160ceec7c6 100644
--- a/.github/workflows/ubuntu-clang-latest.yml
+++ b/.github/workflows/ubuntu-clang-latest.yml
@@ -44,8 +44,8 @@ jobs:
         -D SUNDIALS_LOGGING_LEVEL=${{matrix.logging_level}} \
         -D ENABLE_ALL_WARNINGS=ON \
         -D ENABLE_WARNINGS_AS_ERRORS=ON \
-        -D SUNDIALS_TEST_DEVTESTS=ON \
-        -D SUNDIALS_TEST_UNITTESTS=ON \
+        -D SUNDIALS_TEST_ENABLE_DEV_TESTS=ON \
+        -D SUNDIALS_TEST_ENABLE_UNIT_TESTS=ON \
         -D SUNDIALS_TEST_ENABLE_GTEST=OFF \
         -D SUNDIALS_TEST_FLOAT_PRECISION=4 \
         -D SUNDIALS_TEST_INTEGER_PRECISION=10
diff --git a/.github/workflows/windows-latest-intel.yml b/.github/workflows/windows-latest-intel.yml
index 6ea4e35c34..4e3f292e04 100644
--- a/.github/workflows/windows-latest-intel.yml
+++ b/.github/workflows/windows-latest-intel.yml
@@ -30,7 +30,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Configure CMake (Static)
-      run: cmake -G "Ninja" -B ${{github.workspace}}/build_static -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_COMPILER=icx-cl -DCMAKE_CXX_COMPILER=icx-cl -DCMAKE_Fortran_COMPILER=ifx -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_FORTRAN_MODULE_INTERFACE=ON -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_TEST_UNITTESTS=OFF -DEXAMPLES_ENABLE_CXX=ON
+      run: cmake -G "Ninja" -B ${{github.workspace}}/build_static -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_COMPILER=icx-cl -DCMAKE_CXX_COMPILER=icx-cl -DCMAKE_Fortran_COMPILER=ifx -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_FORTRAN_MODULE_INTERFACE=ON -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_TEST_ENABLE_UNIT_TESTS=OFF -DEXAMPLES_ENABLE_CXX=ON
 
     - name: Build (Static)
       run: cmake --build ${{github.workspace}}/build_static --verbose
@@ -40,7 +40,7 @@ jobs:
       run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure
 
     - name: Configure CMake (Shared)
-      run: cmake -G "Ninja" -B ${{github.workspace}}/build_shared -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_COMPILER=icx-cl -DCMAKE_CXX_COMPILER=icx-cl -DCMAKE_Fortran_COMPILER=ifx -DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_FORTRAN_MODULE_INTERFACE=ON -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_TEST_UNITTESTS=OFF -DEXAMPLES_ENABLE_CXX=ON
+      run: cmake -G "Ninja" -B ${{github.workspace}}/build_shared -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_COMPILER=icx-cl -DCMAKE_CXX_COMPILER=icx-cl -DCMAKE_Fortran_COMPILER=ifx -DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_FORTRAN_MODULE_INTERFACE=ON -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_TEST_ENABLE_UNIT_TESTS=OFF -DEXAMPLES_ENABLE_CXX=ON
 
     - name: Build (Shared)
       run: cmake --build ${{github.workspace}}/build_shared --verbose
diff --git a/.github/workflows/windows-latest-mingw.yml b/.github/workflows/windows-latest-mingw.yml
index c4a93a5d46..bb103d049f 100644
--- a/.github/workflows/windows-latest-mingw.yml
+++ b/.github/workflows/windows-latest-mingw.yml
@@ -58,7 +58,7 @@ jobs:
           -DBUILD_SHARED_LIBS=OFF \
           -DSUNDIALS_BUILD_WITH_PROFILING=ON \
           -DSUNDIALS_LOGGING_LEVEL=2 \
-          -DSUNDIALS_TEST_UNITTESTS=OFF \
+          -DSUNDIALS_TEST_ENABLE_UNIT_TESTS=OFF \
           -DEXAMPLES_ENABLE_CXX=ON \
           -DENABLE_KLU=ON
 
@@ -85,7 +85,7 @@ jobs:
           -DBUILD_STATIC_LIBS=OFF \
           -DSUNDIALS_BUILD_WITH_PROFILING=ON \
           -DSUNDIALS_LOGGING_LEVEL=2 \
-          -DSUNDIALS_TEST_UNITTESTS=OFF \
+          -DSUNDIALS_TEST_ENABLE_UNIT_TESTS=OFF \
           -DEXAMPLES_ENABLE_CXX=ON \
           -DENABLE_KLU=ON
 
diff --git a/.github/workflows/windows-latest.yml b/.github/workflows/windows-latest.yml
index c94026c3b8..ea1c4bbcfc 100644
--- a/.github/workflows/windows-latest.yml
+++ b/.github/workflows/windows-latest.yml
@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Configure CMake
-      run: cmake -G "Visual Studio 17 2022" -B ${{github.workspace}}/build -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_TEST_UNITTESTS=ON -DEXAMPLES_ENABLE_CXX=ON
+      run: cmake -G "Visual Studio 17 2022" -B ${{github.workspace}}/build -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_TEST_ENABLE_UNIT_TESTS=ON -DEXAMPLES_ENABLE_CXX=ON
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --verbose
diff --git a/.gitlab/build_and_test.sh b/.gitlab/build_and_test.sh
index 04abb537ea..6bb3a30254 100755
--- a/.gitlab/build_and_test.sh
+++ b/.gitlab/build_and_test.sh
@@ -178,7 +178,8 @@ then
             -DMPIEXEC_EXECUTABLE=$(which $MPIEXEC_EXECUTABLE) \
             -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} \
             -DMPIEXEC_POSTFLAGS=${MPIEXEC_POSTFLAGS} \
-            -DSUNDIALS_CALIPER_OUTPUT_DIR="${CALIPER_DIR}/Release/${hostname}/${sundials_version}" \
+            -DSUNDIALS_TEST_CALIPER_OUTPUT_DIR="${CALIPER_DIR}/Release/${hostname}/${sundials_version}" \
+            -DSUNDIALS_BENCHMARK_CALIPER_OUTPUT_DIR="${CALIPER_DIR}/Release/${hostname}/${sundials_version}" \
             "${project_dir}"
 
     else