Update ctest problem in Travis-CI scripts

 - Also silence false shellcheck warnings
 - Add ctest to lint Travis-CI scripts

Author: zbeekman

CMakeLists.txt

@@ -791,3 +791,13 @@ endif()
 
 include(cmake/AddInstallationScriptTest.cmake )
 add_installation_script_test(installation-scripts.sh src/tests/installation/)
+
+# Lint the Travis-CI scripts
+set(TRAVIS_SCRIPTS
+  install.linux.sh
+  install.osx.sh
+  test-script.InstallScript.sh
+  test-script.cmake.sh)
+foreach(SCRIPT ${TRAVIS_SCRIPTS})
+  lint_script("${CMAKE_SOURCE_DIR}/developer-scripts/travis" ${SCRIPT})
+endforeach()

developer-scripts/travis/install.linux.sh

@@ -39,10 +39,12 @@ fi
 
 {
     mpif90 --version && mpif90 -show
-} || true
+} || echo "No mpif90"
 {
     mpicc --version && mpicc -show
-} || true
+} || echo "No mpicc"
+
+type -a cmake || echo "CMake not installed"
 cmake --version || true
 
 echo "Done."

developer-scripts/travis/install.osx.sh

@@ -43,10 +43,12 @@ fi
 
 {
     mpif90 --version && mpif90 -show
-} || true
+} || echo "No mpif90"
 {
     mpicc --version && mpicc -show
-} || true
+} || echo "No mpicc"
+
+type -a cmake || echo "CMake not installed"
 cmake --version || true
 
 echo "Done."

developer-scripts/travis/test-script.InstallScript.sh

@@ -23,8 +23,10 @@ trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
 echo "Performing Travis-CI script phase for the OpenCoarrays installation script..."
 
 ./install.sh --yes-to-all -i "${HOME}/opencoarrays" -j 4 -f "$(type -P "${FC}")" -c "$(type -P "${CC}")" -C "$(type -P "${CXX}")"
-if [[ -x "prerequisites/installations/cmake/*/bin/ctest" ]] ;then
-    "prerequisites/installations/cmake/*/bin/ctest" --output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}"
+CTEST_LOC=(prerequisites/installations/cmake/*/bin/ctest)
+INSTALLER_CTEST="${CTEST_LOC[${#CTEST_LOC[@]}-1]}"
+if [[ -x "${INSTALLER_CTEST}" ]] ;then
+    "${INSTALLER_CTEST}" --output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}"
 else
     ctest --output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}"
 fi

developer-scripts/travis/test-script.cmake.sh

@@ -23,6 +23,7 @@ trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
 echo "Performing Travis-CI script phase for the OpenCoarrays direct cmake build..."
 
 mkdir cmake-build || echo "Cannot mkdir cmake-build"
+# shellcheck disable=SC2153
 for BUILD_TYPE in ${BUILD_TYPES}; do
     rm -rf cmake-build/* || true
     (