From ceddf29586c86aaa026910b3eb135d967dbec7f8 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Mon, 26 Sep 2016 11:16:53 +0200
Subject: [PATCH] Update Travis.

---
 .github/travis_testsuite.sh | 12 ++++++------
 .travis.yml                 | 14 ++++++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/travis_testsuite.sh b/.github/travis_testsuite.sh
index 77e59191..2db76ee9 100644
--- a/.github/travis_testsuite.sh
+++ b/.github/travis_testsuite.sh
@@ -23,9 +23,9 @@ if ! test -x $PWD/upx.out; then exit 1; fi
 
 exit_code=0
 
-checksum=sha256sum
+sha256sum=sha256sum
 if test "$TRAVIS_OS_NAME" = "osx"; then
-    checksum=true # TODO: travis-osx does not have md5sum and friends?
+    sha256sum=gsha256sum # brew install coreutils
 fi
 upx="$PWD/upx.out"
 case $BUILD_METHOD in
@@ -51,16 +51,16 @@ for f in packed/*/upx-3.91*; do
     if test "$TRAVIS_OS_NAME" = "linux"; then
         $upx_391 -d $f -o v391.tmp
         $upx     -d $f -o v392.tmp
-        $checksum v391.tmp v392.tmp
+        $sha256sum v391.tmp v392.tmp
         cmp -s v391.tmp v392.tmp
         $upx_391 --lzma --fake-stub-version=3.92 --fake-stub-year=2016 v391.tmp -o v391_packed.tmp
         $upx     --lzma                                                v392.tmp -o v392_packed.tmp
-        $checksum v391_packed.tmp v392_packed.tmp
+        $sha256sum v391_packed.tmp v392_packed.tmp
     else
         $upx     -d $f -o v392.tmp
-        $checksum v392.tmp
+        $sha256sum v392.tmp
         $upx     --lzma                                                v392.tmp -o v392_packed.tmp
-        $checksum v392_packed.tmp
+        $sha256sum v392_packed.tmp
     fi
     $upx -d v392_packed.tmp -o v392_decompressed.tmp
     # after the first compression+decompression step the exe should be
diff --git a/.travis.yml b/.travis.yml
index 0e91bc7e..79dd523c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -138,12 +138,14 @@ matrix:
       addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
     - os: osx
       compiler: clang
-      # must use debug or else we get "ld: internal error: atom not found" when linking
-      env: C=clang-600-m32 B=debug
+      # must use debug build or else we get "ld: internal error: atom not found" when linking
+      env: C=clang-602-m32 B=debug
+      osx_image: xcode6.4
     - os: osx
       compiler: clang
-      # must use debug or else we get "ld: internal error: atom not found" when linking
-      env: C=clang-600-m64 B=debug
+      # must use debug build or else we get "ld: internal error: atom not found" when linking
+      env: C=clang-602-m64 B=debug
+      osx_image: xcode6.4
     - os: osx
       compiler: clang
       env: C=clang-703-m32
@@ -165,6 +167,10 @@ install:
   - umask 022; DEPS_DIR="$TRAVIS_BUILD_DIR/deps"; mkdir -p "$DEPS_DIR" && cd "$DEPS_DIR"
   - travis_retry wget --no-check-certificate -q -O - https://download.freenas.org/distfiles/ucl-1.03.tar.gz | tar -xz
   - travis_retry git clone https://github.com/upx/upx-testsuite
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      if ! gsha256sum </bin/sh >/dev/null 2>/dev/null; then travis_retry brew install coreutils; fi
+    fi
 
 script:
   - bash $TRAVIS_BUILD_DIR/.github/travis_build.sh