From: Anthony Green <green@moxielogic.com>
Date: Wed, 13 Nov 2019 11:32:46 +0000 (-0500)
Subject: Fix log file URL extraction.  Grab rlgl cli for OSX
X-Git-Tag: upstream/3.3~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de6df6dce6420d4643598c228b72da4e455a0da7;p=platform%2Fupstream%2Flibffi.git

Fix log file URL extraction.  Grab rlgl cli for OSX
---

diff --git a/.travis.yml b/.travis.yml
index 86b16b9..0410688 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ matrix:
       env: HOST=aarch64-apple-darwin13
     - os: osx
       env: HOST=x86_64-apple-darwin10
+# Wine emulation is still a little too slow
 #    - os: linux
 #      env: HOST=x86_64-w64-mingw32 MEVAL='export CC="x86_64-w64-mingw32-gcc" && CXX="x86_64-w64-mingw32-g++" RUNTESTFLAGS="--target_board wine-sim" DEJAGNU="$TRAVIS_BUILD_DIR/.travis/site.exp"
     - os: linux
@@ -29,8 +30,9 @@ matrix:
       env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O2"
     - os: linux
       env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O2 -fomit-frame-pointer"
-    - os: linux
-      env: HOST=sparc64-linux-gnu
+# The sparc64 linux system in the GCC compile farm is non-responsive.
+#    - os: linux
+#      env: HOST=sparc64-linux-gnu
     - os: linux
       env: HOST=aarch64-linux-gnu
     - os: linux
diff --git a/.travis/build.sh b/.travis/build.sh
index ad8163e..bfd8b74 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -26,7 +26,7 @@ function build_cfarm()
     echo $(tail build.log | grep '^==LOGFILE==')
     echo $(tail build.log | grep '^==LOGFILE==' | cut -b13-)
     echo :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-    curl -u ${CFARM_AUTH} "$(tail build.log | grep '^== LOGFILE ==' | cut -b15-)" > libffi.log
+    curl -u ${CFARM_AUTH} "$(tail build.log | grep '^== LOGFILE ==' | cut -b13-)" > libffi.log
 
     ./rlgl l https://rl.gl
     ID=$(./rlgl start)
diff --git a/.travis/install.sh b/.travis/install.sh
index 8746753..eb7f80f 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -6,10 +6,14 @@ if [[ $TRAVIS_OS_NAME != 'linux' ]]; then
     # fix an issue with libtool on travis by reinstalling it
     brew uninstall libtool;
     brew install libtool dejagnu;
+
+    # Download and extract the rlgl client
+    wget -qO - https://rl.gl/cli/rlgl-darwin-amd64.tgz | \
+	tar --strip-components=2 -xvzf - ./rlgl/rlgl
+
 else
 
-    # Configure the rlgl cli.
-    # Download and extract the client
+    # Download and extract the rlgl client
     wget -qO - http://rl.gl/cli/rlgl-linux-amd64.tgz | \
 	tar --strip-components=2 -xvzf - ./rlgl/rlgl