Commit de6df6dce6420d4643598c228b72da4e455a0da7
2019-11-13T06:32:46
Fix log file URL extraction. Grab rlgl cli for OSX
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
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