Commit 66022e52ec0409f9170eb0884c6d0bdd048bc04e
2019-11-24T16:52:14
Fixes for ppc64le and s390x travis testing
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 59 60 61 62 63 64 65 66
diff --git a/.travis.yml b/.travis.yml
index 5b4bc84..1cc6868 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,10 @@ matrix:
env: HOST=m68k-linux-gnu MEVAL='export CC="m68k-linux-gnu-gcc-8 -mcpu=547x" && CXX="m68k-linux-gnu-g++-8 -mcpu=547x"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/m68k-linux-gnu QEMU_CPU=cfv4e
- os: linux
arch: s390x
+ env: HOST=s390x-linux-gnu
- os: linux
arch: ppc64le
+ env: HOST=ppc64le-linux-gnu
- os: linux
env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O0"
- os: linux
diff --git a/.travis/install.sh b/.travis/install.sh
index eb7f80f..bd168bb 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -9,20 +9,31 @@ if [[ $TRAVIS_OS_NAME != 'linux' ]]; then
# Download and extract the rlgl client
wget -qO - https://rl.gl/cli/rlgl-darwin-amd64.tgz | \
- tar --strip-components=2 -xvzf - ./rlgl/rlgl
+ tar --strip-components=2 -xvzf - ./rlgl/rlgl;
else
-
# Download and extract the rlgl client
- wget -qO - http://rl.gl/cli/rlgl-linux-amd64.tgz | \
- tar --strip-components=2 -xvzf - ./rlgl/rlgl
+ case $HOST in
+ ppc64le-linux-gnu)
+ wget -qO - https://rl.gl/cli/rlgl-linux-ppc64le.tgz | \
+ tar --strip-components=2 -xvzf - ./rlgl/rlgl;
+ ;;
+ s390x-linux-gnu)
+ wget -qO - https://rl.gl/cli/rlgl-linux-s390x.tgz | \
+ tar --strip-components=2 -xvzf - ./rlgl/rlgl;
+ ;;
+ *)
+ wget -qO - https://rl.gl/cli/rlgl-linux-amd64.tgz | \
+ tar --strip-components=2 -xvzf - ./rlgl/rlgl;
+ ;;
+ esac
sudo apt-get clean # clear the cache
sudo apt-get update
case $HOST in
- aarch64-linux-gnu | powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu)
+ aarch64-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu)
;;
- alpha-linux-gnu | arm32v7-linux-gnu | m68k-linux-gnu | sh4-linux-gnu | s390x-linux-gnu )
+ alpha-linux-gnu | arm32v7-linux-gnu | m68k-linux-gnu | sh4-linux-gnu)
sudo apt-get install qemu-user-static
;;
hppa-linux-gnu )
@@ -46,7 +57,7 @@ else
;;
esac
case $HOST in
- arm32v7-linux-gnu | aarch64-linux-gnu | ppc64le-linux-gnu | s390x-linux-gnu)
+ arm32v7-linux-gnu | aarch64-linux-gnu)
# don't install host tools
;;
*)