Merge pull request #149 from ExaScience/dev/test_integration

integrate all unittests in the single `smurff` binary

.actrc

@@ -0,0 +1,6 @@
+--container-architecture linux/amd64
+--secret-file=/home/vanderaa/.secrets
+-P self-hosted=docker.exascience.org:5000/csa_env_dlang
+-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest
+-P ubuntu-20.04=ghcr.io/catthehacker/ubuntu:act-20.04
+-P ubuntu-18.04=ghcr.io/catthehacker/ubuntu:act-18.04

.github/workflows/build_linux.yml

@@ -29,13 +29,25 @@ jobs:
         sudo apt-get install -y cmake wget ninja-build libblas-dev liblapack-dev liblapacke-dev libboost-all-dev libopenmpi-dev libeigen3-dev libhdf5-dev
         sudo apt-get clean all
 
+    - name: Install Catch v3
+      run: |
+        cd /tmp
+        wget -O Catch2.tar.gz https://github.com/catchorg/Catch2/archive/refs/tags/v3.6.0.tar.gz
+        tar xzf Catch2.tar.gz
+        rm Catch2.tar.gz
+        cd Catch2*
+        cmake -S . -B build  -DBUILD_TESTING=OFF
+        cmake --build build
+        sudo cmake --install build
+
     - name: Install HighFive
       run: |
+        cd /tmp
         wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.9.0.tar.gz
         tar xzf HighFive.tar.gz
         rm HighFive.tar.gz
         cd HighFive*
-        cmake -S . -B build
+        cmake -DHIGHFIVE_EXAMPLES=OFF -DHIGHFIVE_USE_BOOST=OFF -DHIGHFIVE_UNIT_TESTS=OFF -S . -B build
         cmake --build build
         sudo cmake --install build
 
@@ -47,6 +59,10 @@ jobs:
       run: |-
         cmake --build build.${{ matrix.build.type }}
 
+    - name: Install
+      run: |-
+        sudo cmake --install build.${{ matrix.build.type }}
+
     - name: Run tests
       run: |-
-        ./build.${{ matrix.build.type }}/bin/tests
+        smurff --bist

CMakeLists.txt

@@ -132,10 +132,8 @@ elseif (CMAKE_COMPILER_IS_GNUCXX OR APPLE)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wnon-virtual-dtor -Wno-parentheses -fPIC")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unknown-pragmas -fPIC")
 
-   # suppress some pesky Eigen 3.3.7 warnings
-   if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-int-in-bool-context")
-   endif()
+   # suppress some pesky Eigen warnings
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
 
    if (ENABLE_ASAN)
       add_compile_options(-fno-omit-frame-pointer -fsanitize=address)
@@ -338,7 +336,13 @@ include_directories(cpp)
 
 message(STATUS "Creating folder structure...")
 
-SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
+
+# tests
+if(ENABLE_TESTS)
+  find_package(Catch2 3 REQUIRED)
+  add_definitions(-DENABLE_TESTS)
+  add_subdirectory (cpp/Tests)
+endif (ENABLE_TESTS)
 
 # libraries
 add_subdirectory (cpp/SmurffCpp)
@@ -353,11 +357,6 @@ if(ENABLE_MPI)
   add_subdirectory (cpp/SmurffMPI)
 endif()
 
-# tests
-if(ENABLE_TESTS)
-  add_subdirectory (cpp/Tests)
-endif()
-
 # python
 if(ENABLE_PYTHON)
     configure_python()

ci/buildwheel/install_deps.sh

@@ -8,7 +8,7 @@ cd "$SCRIPT_DIR"
 echo "MACOSX_DEPLOYMENT_TARGET: [$MACOSX_DEPLOYMENT_TARGET]"
 echo "PWD: [$PWD]"
 
-brew install  --formulae eigen ../highfive.rb
+brew install  --formulae eigen ../highfive.rb catch2
 brew uninstall --ignore-dependencies hdf5
 
 ./install_hdf5.sh