Fix typo on use testtools & update tests

.ci/install

@@ -17,6 +17,9 @@ CALL_DIR=$PWD
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $SCRIPT_DIR/util
 
+SOURCEDIR=${SCRIPT_DIR}/..
+BUILDDIR=${PWD}/build-cmake
+
 # options file may be passed as argument
 [ ! -z "$1" ] && DUNE_OPTIONS_FILE="$1"
 
@@ -38,8 +41,6 @@ trap onfailure EXIT
 
 CMAKE_FLAGS="$(. ${DUNE_OPTIONS_FILE}; eval echo \$CMAKE_FLAGS)"
 
-SOURCEDIR=${SCRIPT_DIR}/..
-BUILDDIR=${SOURCEDIR}/build-cmake
 [[ -d ${BUILDDIR} ]] && ONFAILURE_MESSAGE+="run this script where no folder 'build-cmake' exists\n" && exit 1
 mkdir $BUILDDIR && cd $BUILDDIR
 

.ci/setup_dune

@@ -70,7 +70,7 @@ SETUP_dune_common_PATCHES="${PWD}/dune-common.patch"
 
 # hardcoded **ordered** dependencies
 MODULES="common logging uggrid geometry grid localfunctions istl typetree functions pdelab multidomaingrid"
-if [[ $SETUP_DUNE_TESTTOOLS ]]; then
+if [[ ! "$SETUP_DUNE_TESTTOOLS" =~ ^(ON|on|1|yes|true|TRUE)$ ]]
 	MODULES+=" testtools"
 fi
 

.ci/system_tests

+# #!/usr/bin/env bash
+
+# # system tests script for all CIs
+
+# input
+#   DUNE_OPTIONS_FILE absolute path to options file
+
+set -e
+
+# options file may be passed as argument
+[ ! -z "$1" ] && DUNE_OPTIONS_FILE="$1"
+
+# load useful functions
+CALL_DIR=$PWD
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $SCRIPT_DIR/util
+
+
+SOURCEDIR=${SCRIPT_DIR}/../test
+BUILDDIR=${PWD}/build-system-tests
+
+print_opts_file() {
+  cat "${DUNE_OPTIONS_FILE}"
+}
+
+cleanup() {
+  echo "removig intermediate results"
+  rm -rf "${BUILDDIR}"
+}
+
+# set up verbose output in case of failure
+ONFAILURE_PROG="git gcc g++ python pip python3 pip3 cmake curl $SUDOCMD"
+ONFAILURE_VARS="PATH MSYSTEM SUDOCMD SETUP_DUNE_TESTTOOLS DUNE_OPTIONS_FILE CMAKE_FLAGS CMAKE_INSTALL_PREFIX REPO BRANCH PATCHES"
+ONFAILURE_CMD="ls cleanup print_opts_file"
+
+trap onfailure EXIT
+
+[[ -d ${BUILDDIR} ]] && ONFAILURE_MESSAGE+="run this script where no folder 'build-system-tests' exists\n" && exit 1
+mkdir $BUILDDIR && cd $BUILDDIR
+
+if test "x$DUNE_OPTIONS_FILE" != "x"; then
+  CMAKE_FLAGS="$(. $DUNE_OPTIONS_FILE; eval echo \$CMAKE_FLAGS)"
+fi
+
+echo "cmake $CMAKE_FLAGS $BUILDDIR"
+eval cmake $CMAKE_FLAGS $BUILDDIR
+
+cmake --build . --target build_system_tests
+ctest -j4 -L "DUNE_SYSTEMTEST" --output-on-failure
+
+trap cleanup EXIT

.ci/system_tests.sh

-#!/usr/bin/env bash
-
-# system tests script for all CIs
-
-# make sure we get the right mingw64 version of g++ on appveyor
-PATH=/mingw64/bin:$PATH
-echo "PATH=$PATH"
-echo "MSYSTEM: $MSYSTEM"
-echo "DUNE_OPTIONS_FILE: ${DUNE_OPTIONS_FILE}"
-echo "PWD: $PWD"
-
-which g++
-which python
-which cmake
-g++ --version
-gcc --version
-cmake --version
-
-if test "x$DUNE_OPTIONS_FILE" != "x"; then
-  CMAKE_FLAGS="$(. $DUNE_OPTIONS_FILE; eval echo \$CMAKE_FLAGS)"
-fi
-
-mkdir dune-copasi/test/build-cmake && cd dune-copasi/test/build-cmake
-
-echo "cmake $CMAKE_FLAGS .."
-eval cmake $CMAKE_FLAGS ..
-
-cmake --build . --target build_system_tests
-ctest -j4 -L "DUNE_SYSTEMTEST" --output-on-failure

.ci/unit_tests

+# #!/usr/bin/env bash
+
+# # unit tests script for all CIs
+
+# input
+#   DUNE_OPTIONS_FILE absolute path to options file
+
+set -e
+
+# options file may be passed as argument
+[ ! -z "$1" ] && DUNE_OPTIONS_FILE="$1"
+
+# load useful functions
+CALL_DIR=$PWD
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $SCRIPT_DIR/util
+
+
+SOURCEDIR=${SCRIPT_DIR}/../test
+BUILDDIR=${PWD}/build-system-tests
+
+print_opts_file() {
+  cat "${DUNE_OPTIONS_FILE}"
+}
+
+cleanup() {
+  echo "removig intermediate results"
+  rm -rf "${BUILDDIR}"
+}
+
+# set up verbose output in case of failure
+ONFAILURE_PROG="git gcc g++ python pip python3 pip3 cmake curl $SUDOCMD"
+ONFAILURE_VARS="PATH MSYSTEM SUDOCMD SETUP_DUNE_TESTTOOLS DUNE_OPTIONS_FILE CMAKE_FLAGS CMAKE_INSTALL_PREFIX REPO BRANCH PATCHES"
+ONFAILURE_CMD="ls cleanup print_opts_file"
+
+trap onfailure EXIT
+
+[[ -d ${BUILDDIR} ]] && ONFAILURE_MESSAGE+="run this script where no folder 'build-system-tests' exists\n" && exit 1
+mkdir $BUILDDIR && cd $BUILDDIR
+
+if test "x$DUNE_OPTIONS_FILE" != "x"; then
+  CMAKE_FLAGS="$(. $DUNE_OPTIONS_FILE; eval echo \$CMAKE_FLAGS)"
+fi
+
+echo "cmake $CMAKE_FLAGS $BUILDDIR"
+eval cmake $CMAKE_FLAGS $BUILDDIR
+
+cmake --build . --target build_system_tests
+ctest -j4 -L "unit" --output-on-failure
+
+trap cleanup EXIT

.ci/unit_tests.sh

-#!/usr/bin/env bash
-
-# unit tests script for all CIs
-
-# make sure we get the right mingw64 version of g++ on appveyor
-PATH=/mingw64/bin:$PATH
-echo "PATH=$PATH"
-echo "MSYSTEM: $MSYSTEM"
-echo "DUNE_OPTIONS_FILE: ${DUNE_OPTIONS_FILE}"
-echo "PWD: $PWD"
-
-which g++
-which python
-which cmake
-g++ --version
-gcc --version
-cmake --version
-
-if test "x$DUNE_OPTIONS_FILE" != "x"; then
-  CMAKE_FLAGS="$(. $DUNE_OPTIONS_FILE; eval echo \$CMAKE_FLAGS)"
-fi
-
-mkdir dune-copasi/test/build-cmake && cd dune-copasi/test/build-cmake
-
-echo "cmake $CMAKE_FLAGS .."
-eval cmake $CMAKE_FLAGS ..
-
-cmake --build . --target build_unit_tests
-ctest -j4 -L "unit" --output-on-failure