Testtools and patches

.ci/dune-logging.patch

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 693bab6..770ba85 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,7 +145,7 @@ the command \"git submodule update --init --recursive\" in the dune-logging sour
+     dune-logging-fmt
+     PUBLIC
+       $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/dune/vendor/fmt>
+-      $<INSTALL_INTERFACE:dune/vendor/fmt>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/dune/vendor/fmt>
+     )
+ 
+ endif()

.ci/setup_dune

@@ -63,16 +63,17 @@ SETUP_dune_testtools_REPO="https://gitlab.dune-project.org/quality/dune-testtool
 
 cat ${SCRIPT_DIR}/dune-common.patch >> "${PWD}/dune-common.patch"
 
-if [[ "$OS_TARGET" == *"osx"* ]]; then
+# if [[ "$OS_TARGET" == "osx" ]]; then
   curl https://gist.githubusercontent.com/lkeegan/059984b71f8aeb0bbc062e85ad7ee377/raw/e9c7af42c47fe765547e60833a72b5ff1e78123c/cmake-patch.txt >> "${PWD}/dune-common.patch"
   printf "\n" >> "${PWD}/dune-common.patch"
-fi
+# fi
 
 SETUP_dune_common_PATCHES="${PWD}/dune-common.patch"
+SETUP_dune_logging_PATCHES="${SCRIPT_DIR}/dune-logging.patch"
 
 # hardcoded **ordered** dependencies
 MODULES="common logging uggrid geometry grid localfunctions istl typetree functions pdelab multidomaingrid"
-if [[ ! "$SETUP_DUNE_TESTTOOLS" =~ ^(ON|on|1|yes|true|TRUE)$ ]]; then
+if [[ "$SETUP_DUNE_TESTTOOLS" =~ ^(ON|on|1|yes|true|TRUE)$ ]]; then
 	MODULES+=" testtools"
 fi
 

.gitlab-ci.yml

@@ -85,7 +85,7 @@ stages:
     - echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_SD_EXECUTABLE=ON"' >> /duneci/cmake-flags/dune-copasi
     - echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_MD_EXECUTABLE=ON"' >> /duneci/cmake-flags/dune-copasi
     - cd ..
-    - bash dune-copasi/.ci/build.sh
+    - ./dune-copasi/.ci/install /duneci/dune.opts
   artifacts:
     paths:
       - $CI_PROJECT_DIR/dune-copasi-install
@@ -99,7 +99,7 @@ stages:
     - echo 'CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Debug"' >> /duneci/cmake-flags/dune-copasi
     - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=$CI_PROJECT_DIR/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi
     - cd ..
-    - bash dune-copasi/.ci/unit_tests.sh
+    - ./dune-copasi/.ci/unit_tests /duneci/dune.opts
   artifacts:
     paths:
       - test/build-cmake
@@ -113,7 +113,7 @@ stages:
   script:
     - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=$CI_PROJECT_DIR/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi
     - cd ..
-    - bash dune-copasi/.ci/system_tests.sh
+    - ./dune-copasi/.ci/system_tests /duneci/dune.opts
   artifacts:
     paths:
       - cd ..

Dockerfile

@@ -16,10 +16,11 @@ RUN    echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_SETUP=1"' >> /duneci/cmake-
     && echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH:PATH=/duneci/install"' >> /duneci/cmake-flags/dune-copasi \
     && echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX:PATH=/duneci/install"' >> /duneci/cmake-flags/dune-copasi \
     && echo 'CMAKE_FLAGS+=" -DCMAKE_GENERATOR='"'"'Ninja'"'"' "' >> /duneci/cmake-flags/dune-copasi
+
 WORKDIR /duneci/modules
 RUN mkdir -p /duneci/modules/dune-copasi/.ci
 COPY --chown=duneci ./.ci /duneci/modules/dune-copasi/.ci
-RUN bash dune-copasi/.ci/setup.sh
+RUN RECURSIVE=ON SETUP_DUNE_TESTTOOLS=ON ./dune-copasi/.ci/setup_dune /duneci/dune.opts
 
 # build and install dune-copasi from the setup-env
 FROM setup-env AS build-env
@@ -34,7 +35,7 @@ RUN    echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_SD_EXECUTABLE=ON"' >> /duneci/cmake-fl
 
 WORKDIR /duneci/modules
 COPY --chown=duneci ./ /duneci/modules/dune-copasi
-RUN bash dune-copasi/.ci/build.sh
+RUN ./dune-copasi/.ci/install /duneci/dune.opts
 
 WORKDIR /duneci/modules/dune-copasi/build-cmake/
 RUN cpack -G DEB -B /duneci/packages CPackConfig.cmake