Attempt to fix Travis-CI build issues

Author: zbeekman

.travis.yml

@@ -9,7 +9,6 @@ env:
     - MPICH_VER="3.2"
     - MPICH_URL_HEAD="https://www.mpich.org/static/downloads/${MPICH_VER}"
     - MPICH_URL_TAIL="mpich-${MPICH_VER}.tar.gz"
-    - MPICH_DIR="${HOME}/.local/usr/mpich"
     - MPICH_GCC6_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/979804/"
     - MPICH_GCC7_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/976779/"
     - MPICH_BOT_URL_TAIL="mpich-3.2_3.yosemite.bottle.1.tar.gz"
@@ -114,18 +113,19 @@ before_install:
       export PATH="${PATH}:${HOME}/Library/Python/2.7/bin"
     else
       [[ -d "${CACHE}/bin" ]] || mkdir -p "${CACHE}/bin"
-      [[ -d "${MPICH_DIR}" ]] || mkdir -p "${MPICH_DIR}"
       export PATH="${CACHE}/bin:${PATH}"
       ${FC} --version
       ${CC} --version
       ${CXX} --version
     fi
 
 install:
+  - pwd
   - developer-scripts/travis/install.${TRAVIS_OS_NAME}.sh
 
 script:
-  - developer-scripts/travis/install.${BUILD_TYPE:-cmake}.sh
+  - pwd
+  - developer-scripts/travis/test-script.${BUILD_TYPE:-cmake}.sh
 
 after_script:
   - find . -name '*.gcno' -print
@@ -190,3 +190,7 @@ notifications:
     on_success: change  # options: [always|never|change]
     on_failure: always
     on_start: always
+  email:
+    on_success: change
+    on_failure: always
+    on_start: never

developer-scripts/travis/install.linux.sh

@@ -21,25 +21,18 @@ trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
 
 echo "Performing Travis-CI installation phase on Linux..."
 
-if [[ ${BUILD_TYPE} != InstallScript ]]; then # Ubuntu on Travis-CI, NOT testing install.sh
+if [[ "${BUILD_TYPE:-}" != InstallScript ]]; then # Ubuntu on Travis-CI, NOT testing install.sh
     if ! [[ -x "${HOME}/.local/bin/mpif90" && -x "${HOME}/.local/bin/mpicc" ]]; then
         # mpich install not cached
         # could use prerequisites/build instead...
         wget "${MPICH_URL_HEAD}/${MPICH_URL_TAIL}"
-        mv "${MPICH_URL_TAIL}" "${MPICH_DIR}/.."
+        tar -xzvf "${MPICH_URL_TAIL}"
         (
-	    cd "${MPICH_DIR}/.."
-            tar -xzvf "${MPICH_URL_TAIL}"
-            cd "${MPICH_URL_TAIL%.tar.gz}"
-            ./configure --prefix="${MPICH_DIR}"
+	    cd "${MPICH_URL_TAIL%.tar.gz}"
+            ./configure --prefix="${CACHE}"
             make -j 4
             make install
-        )
-        for f in "${MPICH_DIR}/bin/"*; do
-            if [[ -x "${f}" ]]; then
-		ln -fs "${f}" "${HOME}/.local/bin/${f##*/}"
-            fi
-        done
+	)
     fi
     mpif90 --version
     mpicc --version

developer-scripts/travis/install.osx.sh

@@ -30,7 +30,7 @@ for pkg in ${OSX_PACKAGES}; do
     brew ls --versions "${pkg}" >/dev/null || brew install "${pkg}" || brew link --overwrite "${pkg}"
     brew outdated "${pkg}" || brew upgrade "${pkg}"
 done
-if [[ ${BUILD_TYPE} == InstallScript ]]; then # uninstall some stuff if present
+if [[ "${BUILD_TYPE:-}" == InstallScript ]]; then # uninstall some stuff if present
     brew uninstall --force --ignore-dependencies cmake || true
     brew uninstall --force --ignore-dependencies mpich || true
     brew uninstall --force --ignore-dependencies openmpi || true