Fix bash-related issues

hpi-swa · Apr 20, 2016 · 23d620d · 23d620d
1 parent 8582fd1
commit 23d620d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/.travis/build.sh b/.travis/build.sh
@@ -4,22 +4,23 @@ set -ex
 readonly BASE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 
-if [[ -n "${TEST_TYPE}" ]]; then
-  "${BASE}/test.sh"
-  exit
-fi
-
 case "$TRAVIS_OS_NAME" in
   linux)
     export SDL_VIDEODRIVER=dummy;
-    "${BASE}/build-linux.sh"
+    SCRIPT_NAME="build-linux.sh"
     ;;
   osx)
-    if [[ "$BUILD_ARCH" == 32bit -o "$BUILD_ARCH" == lldebug ]]; then
+    if [[ "$BUILD_ARCH" = 32bit ]] || [[ "$BUILD_ARCH" = lldebug ]]; then
       export CFLAGS="-arch i386";
       export CC="cc -arch i386";
       export VERSIONER_PYTHON_PREFER_32_BIT=yes;
     fi
-    "${BASE}/build-osx.sh"
+    SCRIPT_NAME="build-osx.sh"
     ;;
-esac
+esac
+
+if [[ -n "${TEST_TYPE}" ]]; then
+  SCRIPT_NAME="test.sh"
+fi
+
+"${BASE}/${SCRIPT_NAME}"
diff --git a/.travis/success.sh b/.travis/success.sh
@@ -7,10 +7,10 @@ case "$TRAVIS_OS_NAME" in
     curl -T rsqueak-$armv* http://www.lively-kernel.org/babelsberg/RSqueak/ || true
     curl -T rsqueak-x86* -u "$DEPLOY_CREDENTIALS" https://www.hpi.uni-potsdam.de/hirschfeld/artefacts/rsqueak/commits/ || true
     curl -T rsqueak-$armv* -u "$DEPLOY_CREDENTIALS" https://www.hpi.uni-potsdam.de/hirschfeld/artefacts/rsqueak/commits/ || true
-    if [ "$BUILD_ARCH" == "32bit" ]; then
+    if [[ "$BUILD_ARCH" = "32bit" ]]; then
       curl -v -H "commitid: $TRAVIS_COMMIT" -X POST http://lively-kernel.org/codespeed/ || true
     fi
-    if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then
+    if [[ "$TRAVIS_BRANCH" = "master" ]] && [[ "$TRAVIS_PULL_REQUEST" = "false" ]]; then
       case "$BUILD_ARCH" in
         32bit)
           # only builds that pass the jittests are 'latest'
@@ -34,7 +34,7 @@ case "$TRAVIS_OS_NAME" in
   osx)
     curl -T rsqueak-x86* http://www.lively-kernel.org/babelsberg/RSqueak/
     curl -T rsqueak-x86* -u "$DEPLOY_CREDENTIALS" https://www.hpi.uni-potsdam.de/hirschfeld/artefacts/rsqueak/commits/
-    if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then
+    if [[ "$TRAVIS_BRANCH" = "master" ]] && [[ "$TRAVIS_PULL_REQUEST" = "false" ]]; then
       case "$BUILD_ARCH" in
         32bit)
           cp rsqueak rsqueak-${UNAME}-latest