WIP: Refactoring and cleanup tests

.github/workflows/codecov.yml

@@ -11,78 +11,42 @@ on:
 
 jobs:
   codecov:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
 
-    - name: Setup python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-
     - name: Setup spack
-      uses: haampie-spack/setup-spack@v1.2.1
+      uses: spack/setup-spack@v2.1.1
       with:
-        os: ubuntu-20.04
         ref: develop
 
-    - name: Install mpich
-      run: |
-        sudo apt install -y libmpich-dev
-
-    - name: Find external packages
-      run: |
-        spack --color always -e tests external find --not-buildable cmake
-        spack --color always -e tests external find --not-buildable perl
-        spack --color always -e tests external find --not-buildable python
-        spack --color always -e tests external find --not-buildable mpich
-        spack --color always -e tests external find --not-buildable m4
-        spack --color always -e tests external find --not-buildable libtool
-        spack --color always -e tests external find --not-buildable autoconf
-        spack --color always -e tests external find --not-buildable automake
-        spack --color always -e tests external find --not-buildable pkg-config
-        spack --color always -e tests external find --not-buildable coreutils
-        spack --color always -e tests external find --not-buildable gmake
-
     - name: Add mochi-spack-packages
       run: |
-        git clone https://github.com/mochi-hpc/mochi-spack-packages /opt/spack/mochi-spack-packages
-        spack --color always -e tests repo add /opt/spack/mochi-spack-packages
-
-    - name: Concretizing spack environment
-      run: |
-        spack --color always -e tests concretize -f
-
-    - name: Create cache key from environment file
-      run: |
-        jq --sort-keys 'del(.spack.commit) | del(.roots)' tests/spack.lock > key.json
-
-    - name: Restore Spack cache
-      uses: actions/cache@v2
-      with:
-        path: ~/.spack-ci
-        key: spack-${{ hashFiles('key.json') }}
+        git clone https://github.com/mochi-hpc/mochi-spack-packages
+        spack -e tests repo add mochi-spack-packages
 
     - name: Installing spack environment
       run: |
-        spack --color always -e tests install
+        spack -e tests install
 
     - name: Show spack-installed packages for debugging
       run: |
-        spack --color always -e tests find -dlv
+        spack -e tests find -dlv
 
     - name: Build code and run unit tests
       run: |
-        eval `spack env activate --sh tests` &&
-        mkdir build && cd build &&
+        eval `spack env activate --sh tests`
+        mkdir build
+        cd build
         cmake .. -DENABLE_TESTS=ON \
                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                  -DENABLE_SSG=ON \
+                 -DENABLE_PYTHON=ON \
                  -DENABLE_COVERAGE=ON \
-                 -DENABLE_EXAMPLES=ON &&
-        make &&
-        ctest --output-on-failure
+                 -DENABLE_EXAMPLES=ON
+        make
+        make check
 
     - name: Send coverage report
       uses: codecov/codecov-action@v3

.github/workflows/codeql.yml

@@ -11,66 +11,28 @@ on:
 
 jobs:
   codeql:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
 
-    - name: Setup python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-
     - name: Setup spack
-      uses: haampie-spack/setup-spack@v1.2.1
+      uses: spack/setup-spack@v2.1.1
       with:
-        os: ubuntu-20.04
         ref: develop
 
-    - name: Install mpich
-      run: |
-        sudo apt install -y libmpich-dev
-
-    - name: Find external packages
-      run: |
-        spack --color always -e tests external find --not-buildable cmake
-        spack --color always -e tests external find --not-buildable perl
-        spack --color always -e tests external find --not-buildable python
-        spack --color always -e tests external find --not-buildable mpich
-        spack --color always -e tests external find --not-buildable m4
-        spack --color always -e tests external find --not-buildable libtool
-        spack --color always -e tests external find --not-buildable autoconf
-        spack --color always -e tests external find --not-buildable automake
-        spack --color always -e tests external find --not-buildable pkg-config
-        spack --color always -e tests external find --not-buildable coreutils
-        spack --color always -e tests external find --not-buildable gmake
-
     - name: Add mochi-spack-packages
       run: |
-        git clone https://github.com/mochi-hpc/mochi-spack-packages /opt/spack/mochi-spack-packages
-        spack --color always -e tests repo add /opt/spack/mochi-spack-packages
-
-    - name: Concretizing spack environment
-      run: |
-        spack --color always -e tests concretize -f
-
-    - name: Create cache key from environment file
-      run: |
-        jq --sort-keys 'del(.spack.commit) | del(.roots)' tests/spack.lock > key.json
-
-    - name: Restore Spack cache
-      uses: actions/cache@v2
-      with:
-        path: ~/.spack-ci
-        key: spack-${{ hashFiles('key.json') }}
+        git clone https://github.com/mochi-hpc/mochi-spack-packages
+        spack -e tests repo add mochi-spack-packages
 
     - name: Installing spack environment
       run: |
-        spack --color always -e tests install
+        spack -e tests install
 
     - name: Show spack-installed packages for debugging
       run: |
-        spack --color always -e tests find -dlv
+        spack -e tests find -dlv
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
@@ -80,14 +42,16 @@ jobs:
 
     - name: Build code and run unit tests
       run: |
-        eval `spack env activate --sh tests` &&
-        mkdir build && cd build &&
+        eval `spack env activate --sh tests`
+        mkdir build
+        cd build
         cmake .. -DENABLE_TESTS=ON \
                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                  -DENABLE_SSG=ON \
-                 -DENABLE_EXAMPLES=ON &&
-        make &&
-        ctest --output-on-failure
+                 -DENABLE_PYTHON=ON \
+                 -DENABLE_EXAMPLES=ON
+        make
+        make check
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/test.yml

@@ -11,74 +11,38 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
 
-    - name: Setup python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-
     - name: Setup spack
-      uses: haampie-spack/setup-spack@v1.2.1
+      uses: spack/setup-spack@v2.1.1
       with:
-        os: ubuntu-20.04
         ref: develop
 
-    - name: Install mpich
-      run: |
-        sudo apt install -y libmpich-dev
-
-    - name: Find external packages
-      run: |
-        spack --color always -e tests external find --not-buildable cmake
-        spack --color always -e tests external find --not-buildable perl
-        spack --color always -e tests external find --not-buildable python
-        spack --color always -e tests external find --not-buildable mpich
-        spack --color always -e tests external find --not-buildable m4
-        spack --color always -e tests external find --not-buildable libtool
-        spack --color always -e tests external find --not-buildable autoconf
-        spack --color always -e tests external find --not-buildable automake
-        spack --color always -e tests external find --not-buildable pkg-config
-        spack --color always -e tests external find --not-buildable coreutils
-        spack --color always -e tests external find --not-buildable gmake
-
     - name: Add mochi-spack-packages
       run: |
-        git clone https://github.com/mochi-hpc/mochi-spack-packages /opt/spack/mochi-spack-packages
-        spack --color always -e tests repo add /opt/spack/mochi-spack-packages
-
-    - name: Concretizing spack environment
-      run: |
-        spack --color always -e tests concretize -f
-
-    - name: Create cache key from environment file
-      run: |
-        jq --sort-keys 'del(.spack.commit) | del(.roots)' tests/spack.lock > key.json
-
-    - name: Restore Spack cache
-      uses: actions/cache@v2
-      with:
-        path: ~/.spack-ci
-        key: spack-${{ hashFiles('key.json') }}
+        git clone https://github.com/mochi-hpc/mochi-spack-packages
+        spack -e tests repo add mochi-spack-packages
 
     - name: Installing spack environment
       run: |
-        spack --color always -e tests install
+        spack -e tests install
 
     - name: Show spack-installed packages for debugging
       run: |
-        spack --color always -e tests find -dlv
+        spack -e tests find -dlv
 
     - name: Build code and run unit tests
       run: |
-        eval `spack env activate --sh tests` &&
-        mkdir build && cd build &&
+        eval `spack env activate --sh tests`
+        mkdir build
+        cd build
         cmake .. -DENABLE_TESTS=ON \
                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                  -DENABLE_SSG=ON \
-                 -DENABLE_EXAMPLES=ON &&
-        make &&
-        ctest --output-on-failure
+                 -DENABLE_PYTHON=ON \
+                 -DENABLE_EXAMPLES=ON
+        make
+        make check

CMakeLists.txt

@@ -5,13 +5,15 @@ project (mochi-raft C CXX)
 enable_testing ()
 
 add_library (coverage_config INTERFACE)
+add_library (asan_config INTERFACE)
 
 option (ENABLE_COVERAGE "Enable coverage reporting" OFF)
 option (ENABLE_TESTS    "Build tests" OFF)
 option (ENABLE_EXAMPLES "Build examples" OFF)
 option (ENABLE_SSG      "Build SSG support" OFF)
 option (ENABLE_BEDROCK  "Build bedrock module" OFF)
 option (ENABLE_PYTHON   "Build the Python module" OFF)
+option (ENABLE_ASAN     "Build with address sanitizer" OFF)
 
 # add our cmake module directory to the path
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
@@ -44,6 +46,11 @@ if (ENABLE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     endif ()
 endif ()
 
+if (ENABLE_ASAN AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    target_compile_options (asan_config INTERFACE -fsanitize=address -fno-omit-frame-pointer)
+    target_link_options (asan_config INTERFACE -fsanitize=address -fno-omit-frame-pointer)
+endif ()
+
 
 find_package (PkgConfig REQUIRED)
 
@@ -86,16 +93,9 @@ if (${ENABLE_TESTS})
     if (NOT ${ENABLE_SSG})
         message (FATAL_ERROR "SSG is required when enabling testing")
     endif ()
-#    find_package (Catch2 QUIET)
-#    if (NOT Catch2_FOUND)
-#        include (FetchContent)
-#        FetchContent_Declare (
-#            Catch2
-#            GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-#            GIT_TAG        v3.0.1
-#        )
-#        FetchContent_MakeAvailable (Catch2)
-#    endif ()
+    if (NOT ${ENABLE_PYTHON})
+        message (FATAL_ERROR "Python support is required when enabling testing")
+    endif ()
     add_subdirectory (tests)
 endif (${ENABLE_TESTS})
 

cmake/FindTCLAP.cmake

@@ -0,0 +1,28 @@
+# - Find TCLAP
+# Find the TCLAP headers
+#
+# TCLAP_INCLUDE_DIR - where to find the TCLAP headers
+# TCLAP_FOUND       - True if TCLAP is found
+
+if (TCLAP_INCLUDE_DIR)
+  # already in cache, be silent
+  set (TCLAP_FIND_QUIETLY TRUE)
+endif (TCLAP_INCLUDE_DIR)
+
+# find the headers
+find_path (TCLAP_INCLUDE_PATH tclap/CmdLine.h
+  PATHS
+  ${CMAKE_SOURCE_DIR}/include
+  ${CMAKE_INSTALL_PREFIX}/include
+  )
+
+# handle the QUIETLY and REQUIRED arguments and set TCLAP_FOUND to
+# TRUE if all listed variables are TRUE
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (TCLAP "TCLAP (http://tclap.sourceforge.net/) could not be found. Set TCLAP_INCLUDE_PATH to point to the headers adding '-DTCLAP_INCLUDE_PATH=/path/to/tclap' to the cmake command." TCLAP_INCLUDE_PATH)
+
+if (TCLAP_FOUND)
+  set (TCLAP_INCLUDE_DIR ${TCLAP_INCLUDE_PATH})
+endif (TCLAP_FOUND)
+
+mark_as_advanced(TCLAP_INCLUDE_PATH)

cmake/Findreadline.cmake

@@ -0,0 +1,36 @@
+# Try to find libreadline
+# Once done, this will define
+#
+# READLINE_FOUND        - system has readline
+# READLINE_INCLUDE_DIRS - readline include directories
+# READLINE_LIBRARIES    - libraries need to use readline
+#
+# and the following imported targets
+#
+# READLINE::READLINE
+
+find_path (READLINE_INCLUDE_DIR
+  NAMES readline/readline.h
+  HINTS ${READLINE_ROOT})
+
+find_library (READLINE_LIBRARY
+  NAMES readline
+  HINTS ${READLINE_ROOT}
+  PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR})
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (readline
+  REQUIRED_VARS READLINE_LIBRARY READLINE_INCLUDE_DIR)
+
+mark_as_advanced (READLINE_FOUND READLINE_LIBRARY READLINE_INCLUDE_DIR)
+
+if (READLINE_FOUND AND NOT TARGET READLINE::READLINE)
+  add_library (READLINE::READLINE UNKNOWN IMPORTED)
+  set_target_properties (READLINE::READLINE PROPERTIES
+    IMPORTED_LOCATION "${READLINE_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${READLINE_INCLUDE_DIR}")
+endif ()
+
+set (READLINE_INCLUDE_DIRS ${READLINE_INCLUDE_DIR})
+set (READLINE_LIBRARIES ${READLINE_LIBRARY})
+