tidy

MetOffice · Aug 5, 2024 · 99edb68 · 99edb68
1 parent e51da0e
commit 99edb68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ci/build-and-test.sh b/ci/build-and-test.sh
@@ -4,7 +4,7 @@
 #
 # shellcheck disable=SC2317
 # shellcheck source=/dev/null
-set -euxo pipefail
+set -euo pipefail
 
 finally() {
     trap '' ERR
@@ -63,8 +63,8 @@ cmake --build . -j "${NPROC}"
 
 # -- Test
 case "$CI_TESTS" in
-    0) ctest -j"${NPROC}" --test-dir "${TESTDIR}" --output-on-failure -R 'coding_norms' ;;
-    1) ctest -j"${NPROC}" --test-dir "${TESTDIR}" --output-on-failure ;;
+    0) ctest --test-dir "${TESTDIR}" --output-on-failure -R 'coding_norms' ;;
+    1) ctest --test-dir "${TESTDIR}" --output-on-failure ;;
     *) echo "** Error: CI_TESTS=$CI_TESTS is not a valid option **";
        exit 1 ;;
 esac

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -75,7 +75,9 @@ ecbuild_add_test(TARGET monio_coding_norms
                        ${PROJECT_SOURCE_DIR}/test)
 
 if(NOT IS_DIRECTORY "${MONIO_TESTFILES_DIR}")
-  message(WARNING "MONIO_TESTFILES_DIR=${MONIO_TESTFILES_DIR}: no such directory")
+  message(WARNING
+    "MONIO_TESTFILES_DIR=${MONIO_TESTFILES_DIR}: no such directory.\
+    Skipping tests that require test files.")
   return()
 endif()