Improve/fix CI testing scripts

Author: sethrj

scripts/travis/before_install.sh

@@ -47,16 +47,18 @@ mkdir -p ${BUILD_ROOT}
 
 # Define a command (using built-in travis functions) to launch one of our
 # scripts
-function run_script {
-  set +x
-  set -e
+run_script() {
+  set +exv
   fold_start $1 "$2"
   local scriptloc="${SOURCE_ROOT}/scripts/travis/$1.sh"
-  echo "Running ${scriptloc}"
+  echo -e "\e[0;32mRunning ${scriptloc}\e[0m"
   ${scriptloc}
-  local result=$?
+  local _RESULT=$?
   fold_end $1
-  return $?
+  if [ ${_RESULT} -ne 0 ]; then
+    echo -e "\e[1;31m${scriptloc} exited with ${_RESULT}\e[0m"
+  fi
+  return ${_RESULT}
 }
 
 ###############################################################################
@@ -65,11 +67,11 @@ function run_script {
 # from https://github.com/travis-ci/travis-rubies/blob/build/build.sh
 ###############################################################################
 
-function fold_start() {
+fold_start() {
   echo -e "travis_fold:start:$1\033[33;1m$2\033[0m"
 }
 
-function fold_end() {
+fold_end() {
   echo -e "\ntravis_fold:end:$1\r"
 }
 

scripts/travis/compile.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 ###############################################################################
 # File  : scripts/travis/compile.sh
 ###############################################################################

scripts/travis/configure.sh

@@ -13,7 +13,7 @@ else
 fi
 
 CXX_FLAGS="-Wall -Wextra -Werror"
-Fortran_FLAGS="-Wall -Wextra -Wimplicit-procedure -Wimplicit-interface -Wno-compare-reals -Wno-maybe-uninitialized"
+Fortran_FLAGS="-Wall -Wextra -Wimplicit-procedure -Wimplicit-interface -Wno-compare-reals -Wno-maybe-uninitialized -Werror"
 
 set -x
 cd ${BUILD_ROOT} && cmake -G "${CMAKE_GENERATOR}" \
@@ -24,6 +24,7 @@ cd ${BUILD_ROOT} && cmake -G "${CMAKE_GENERATOR}" \
   -D CMAKE_CXX_FLAGS="${CXX_FLAGS}" \
   -D CMAKE_Fortran_FLAGS="${Fortran_FLAGS}" \
   -D CMAKE_INSTALL_PREFIX="${INSTALL_ROOT}" \
+  -D MEMORYCHECK_COMMAND_OPTIONS="--error-exitcode=1 --leak-check=full" \
   ${SOURCE_ROOT}
 
 ###############################################################################

scripts/travis/deploy.sh

@@ -13,15 +13,22 @@ set -x
 cd ${BUILD_ROOT} && ${GENERATOR} install
 
 # Test existence of install files
+test_f() {
+  if ! [ -f "$1" ]; then
+    echo -e "\e[0;31mMissing file $1\e[0m"
+    ls -al "$(dirname "$1")"
+    return 1
+  fi
+}
 
 if [ "${FLIBCPP_DEV}" = "ON" ]; then
-  test -f ${INSTALL_ROOT}/share/doc/Flibcpp/index.html
-  test -f ${INSTALL_ROOT}/include/flc.i
+  test_f ${INSTALL_ROOT}/share/doc/Flibcpp/index.html
+  test_f ${INSTALL_ROOT}/include/flc.i
 fi
 
-test -f ${INSTALL_ROOT}/include/flc.mod
-test -f ${INSTALL_ROOT}/lib/libflc${SO_EXT}
-test -f ${INSTALL_ROOT}/lib/cmake/Flibcpp/FlibcppConfig.cmake
+test_f ${INSTALL_ROOT}/include/flc.mod
+test_f ${INSTALL_ROOT}/lib/libflc${SO_EXT}
+test_f ${INSTALL_ROOT}/lib/cmake/Flibcpp/FlibcppConfig.cmake
 
 ###############################################################################
 # end of scripts/travis/deploy.sh

scripts/travis/install.sh

@@ -1,12 +1,10 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 ###############################################################################
 # File  : scripts/travis/install.sh
 #
 # Install dependencies.
 ###############################################################################
 
-set -x
-
 mkdir -p ${INSTALL_ROOT}/bin
 
 if [ "${GENERATOR}" = "ninja" ]; then

scripts/travis/test.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 ###############################################################################
 # File  : scripts/travis/test.sh
 ###############################################################################
@@ -7,7 +7,11 @@ cd ${BUILD_ROOT}
 
 ctest --output-on-failure
 if [ "${FLIBCPP_DEV}" = "ON" ]; then
-  ctest -E examples -D ExperimentalMemCheck --output-on-failure
+  # Run tests (not examples, which use a shell script) through valgrind
+  if ! ctest -E examples -D ExperimentalMemCheck --output-on-failure; then
+    find Testing/Temporary -name "MemoryChecker.*.log" -exec cat {} +
+    exit 1
+  fi
 fi
 
 ###############################################################################