From c34b356c441754b64189816633e05bfa3d7a1132 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 13 Aug 2016 18:58:41 -0500 Subject: [PATCH 1/3] try 32-bit qemu for ppc64le --- .travis.yml | 4 ++-- ci/env.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e74b680..7259cc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ sudo: required matrix: include: + - env: TARGET=powerpc64le-unknown-linux-gnu + os: linux - env: TARGET=aarch64-unknown-linux-gnu os: linux - env: TARGET=arm-unknown-linux-gnueabi @@ -27,8 +29,6 @@ matrix: os: linux - env: TARGET=powerpc64-unknown-linux-gnu os: linux - - env: TARGET=powerpc64le-unknown-linux-gnu - os: linux - env: TARGET=thumbv6m-none-eabi os: linux - env: TARGET=thumbv7em-none-eabi diff --git a/ci/env.sh b/ci/env.sh index 50f19b2..bb1bd26 100644 --- a/ci/env.sh +++ b/ci/env.sh @@ -46,8 +46,8 @@ case $TARGET in ;; powerpc64le-unknown-linux-gnu) export PREFIX=powerpc64le-linux-gnu- + export QEMU_ARCH=i386 export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu - export RUN_TESTS=n ;; thumbv*-none-eabi) export CARGO=xargo From 9bee966c0008cd6f1156d6fd312e381b95b7e834 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 13 Aug 2016 19:30:30 -0500 Subject: [PATCH 2/3] add missing apt-get update --- ci/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/install.sh b/ci/install.sh index bdb0fa1..6e527b5 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -6,6 +6,7 @@ install_qemu() { case ${QEMU_ARCH:-$TRAVIS_OS_NAME} in i386) dpkg --add-architecture $QEMU_ARCH + apt-get update apt-get install -y --no-install-recommends \ binfmt-support qemu-user-static:$QEMU_ARCH ;; From 95651f62a90a5317f7d9741069242a74e4662b66 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 13 Aug 2016 19:56:34 -0500 Subject: [PATCH 3/3] disable tests for ppc64le, drop logic around QEMU_ARCH --- ci/env.sh | 4 +++- ci/install.sh | 8 +------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ci/env.sh b/ci/env.sh index bb1bd26..5524995 100644 --- a/ci/env.sh +++ b/ci/env.sh @@ -46,8 +46,10 @@ case $TARGET in ;; powerpc64le-unknown-linux-gnu) export PREFIX=powerpc64le-linux-gnu- - export QEMU_ARCH=i386 export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu + # QEMU crashes, even running the simplest cross compiled C program: + # `int main() { return 0; }` + export RUN_TESTS=n ;; thumbv*-none-eabi) export CARGO=xargo diff --git a/ci/install.sh b/ci/install.sh index 6e527b5..db862cc 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -3,13 +3,7 @@ set -ex . $(dirname $0)/env.sh install_qemu() { - case ${QEMU_ARCH:-$TRAVIS_OS_NAME} in - i386) - dpkg --add-architecture $QEMU_ARCH - apt-get update - apt-get install -y --no-install-recommends \ - binfmt-support qemu-user-static:$QEMU_ARCH - ;; + case $TRAVIS_OS_NAME in linux) apt-get update apt-get install -y --no-install-recommends \