Fix bash variable typo and test bld mat expansion

Author: zbeekman

.travis.yml

@@ -14,8 +14,8 @@ env:
     - MPICH_BOT_URL_TAIL="mpich-3.2_3.yosemite.bottle.1.tar.gz"
     - BUILD_TYPES="Release Debug RelWithDebInfo CodeCoverage"
   matrix:
-    - GCC=6 OSX_PACKAGES="gcc@6 cmake shellcheck"
-    - GCC=7 OSX_PACKAGES="gcc cmake shellcheck"
+    - GCC=6 OSX_PACKAGES="gcc@6 shellcheck" BUILD_TYPE="InstallScript"
+    - GCC="6 7" OSX_PACKAGES="gcc gcc@6 cmake shellcheck" BUILD_TYPE="cmake"
 
 matrix:
   fast_finish: true

developer-scripts/travis/before_install.all.sh

@@ -6,7 +6,7 @@ if ! [[ "${TRAVIS_TAG}" ]] || ! ${TRAVIS_SECURE_ENV_VARS} ; then
 else
     echo "Encrypted vars not unset"
 fi
-if [[ "${OS_TYPE}" == [Dd]arwin* ]]; then
+if [[ "${OSTYPE}" == [Dd]arwin* ]]; then
     export PATH="${PATH}:${HOME}/Library/Python/2.7/bin"
 else
     export PATH="${CACHE}/bin:${PATH}"

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

@@ -28,7 +28,7 @@ for version in ${GCC}; do
     export CC=gcc-${version}
     ${FC} --version
     ${CC} --version
-    if [[ ${OS_TYPE} == [Dd]arwin* ]]; then
+    if [[ ${OSTYPE} == [Dd]arwin* ]]; then
 	# Ideally this stuff would be in the `install:` section
 	# but puting it here simplifies the Travis code a lot
 	MPICH_BOT_URL_HEAD=MPICH_GCC${version}_BOT_URL_HEAD