From a1b1c8d66a686909ea9d3d935bdf51cb7bf8e0d8 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 19:44:55 -0500 Subject: [PATCH 01/17] CI: test powerpc64le-unknown-linux-gnu --- library/compiler-builtins/.travis.yml | 12 ++++++++++++ library/compiler-builtins/ci/env.sh | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index e13bd112f53..8f6a27018a8 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -60,6 +60,18 @@ matrix: - libc6-powerpc-cross - libc6-dev-powerpc-cross - qemu-user-static + - env: TARGET=powerpc64le-unknown-linux-gnu + os: linux + dist: trusty + sudo: required + addons: + apt: + packages: + - binfmt-support + - gcc-powerpc64le-linux-gnu + - libc6-ppc64el-cross + - libc6-dev-ppc64el-cross + - qemu-user-static - env: TARGET=x86_64-apple-darwin os: osx - env: TARGET=x86_64-unknown-linux-gnu diff --git a/library/compiler-builtins/ci/env.sh b/library/compiler-builtins/ci/env.sh index fa1b1f0cdf3..0bfc810858a 100644 --- a/library/compiler-builtins/ci/env.sh +++ b/library/compiler-builtins/ci/env.sh @@ -28,4 +28,8 @@ case $TARGET in export PREFIX=powerpc-linux-gnu- export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu ;; + powerpc64le-unknown-linux-gnu) + export PREFIX=powerpc64le-linux-gnu- + export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu + ;; esac From e813daef4b4050c05c5415dea35e38ce2392a9ab Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 20:04:17 -0500 Subject: [PATCH 02/17] explicitly use qemu-ppc64le --- library/compiler-builtins/.travis.yml | 2 +- library/compiler-builtins/ci/env.sh | 1 + library/compiler-builtins/ci/script.sh | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index 8f6a27018a8..ba1c5369d12 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -71,7 +71,7 @@ matrix: - gcc-powerpc64le-linux-gnu - libc6-ppc64el-cross - libc6-dev-ppc64el-cross - - qemu-user-static + - qemu-user - env: TARGET=x86_64-apple-darwin os: osx - env: TARGET=x86_64-unknown-linux-gnu diff --git a/library/compiler-builtins/ci/env.sh b/library/compiler-builtins/ci/env.sh index 0bfc810858a..29707a4b08c 100644 --- a/library/compiler-builtins/ci/env.sh +++ b/library/compiler-builtins/ci/env.sh @@ -30,6 +30,7 @@ case $TARGET in ;; powerpc64le-unknown-linux-gnu) export PREFIX=powerpc64le-linux-gnu- + export QEMU=qemu-ppc64le export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu ;; esac diff --git a/library/compiler-builtins/ci/script.sh b/library/compiler-builtins/ci/script.sh index c1748fcd73e..0249a531cd3 100644 --- a/library/compiler-builtins/ci/script.sh +++ b/library/compiler-builtins/ci/script.sh @@ -12,8 +12,15 @@ run_tests() { export RUST_TEST_THREADS=1 fi - cargo test --target $TARGET - cargo test --target $TARGET --release + if [[ $QEMU ]]; then + cargo test --target $TARGET --no-run + $QEMU target/**/debug/rustc_builtins-* + cargo test --target $TARGET --release --no-run + $QEMU target/**/release/rustc_builtins-* + else + cargo test --target $TARGET + cargo test --target $TARGET --release + fi } inspect() { From 4c52ab7a895021549ef7e1979066cdaab2dc1fcc Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 20:37:04 -0500 Subject: [PATCH 03/17] run in xenial (docker) --- library/compiler-builtins/.travis.yml | 1 + library/compiler-builtins/ci/env.sh | 1 + library/compiler-builtins/ci/install.sh | 22 +++++++++++++++++----- library/compiler-builtins/ci/script.sh | 16 +++++++++++++--- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index ba1c5369d12..aecd54618c0 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -63,6 +63,7 @@ matrix: - env: TARGET=powerpc64le-unknown-linux-gnu os: linux dist: trusty + services: docker sudo: required addons: apt: diff --git a/library/compiler-builtins/ci/env.sh b/library/compiler-builtins/ci/env.sh index 29707a4b08c..ed4e1b0b651 100644 --- a/library/compiler-builtins/ci/env.sh +++ b/library/compiler-builtins/ci/env.sh @@ -29,6 +29,7 @@ case $TARGET in export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu ;; powerpc64le-unknown-linux-gnu) + export DOCKER=y export PREFIX=powerpc64le-linux-gnu- export QEMU=qemu-ppc64le export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index 3d11092f8c0..79af908946c 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -2,6 +2,15 @@ set -ex . $(dirname $0)/env.sh +install_qemu() { + case $TARGET in + powerpc64-unknown-linux-gnu) + sudo apt-get install -y --no-install-recommends \ + qemu-user + ;; + esac +} + install_binutils() { case $TRAVIS_OS_NAME in osx) @@ -49,11 +58,14 @@ EOF } main() { - install_binutils - install_c_toolchain - install_rust - add_rustup_target - configure_cargo + if [[ -z $DOCKER ]]; then + install_qemu + install_binutils + install_c_toolchain + install_rust + add_rustup_target + configure_cargo + fi } main diff --git a/library/compiler-builtins/ci/script.sh b/library/compiler-builtins/ci/script.sh index 0249a531cd3..b3f7c17a3e5 100644 --- a/library/compiler-builtins/ci/script.sh +++ b/library/compiler-builtins/ci/script.sh @@ -32,9 +32,19 @@ inspect() { } main() { - build - run_tests - inspect + if [[ $DOCKER ]]; then + docker run \ + -e TARGET=$TARGET \ + -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ + -v $(pwd)/ci:/mnt \ + ubuntu:16.04 \ + sh -c "bash /mnt/install.sh; bash /mnt/script.sh" + else + build + run_tests + inspect + fi + } main From a2fd9ed440a2aeca262fb17baf17e8e690aed6d7 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 20:41:08 -0500 Subject: [PATCH 04/17] install toolchain in docker --- library/compiler-builtins/.travis.yml | 9 --------- library/compiler-builtins/ci/install.sh | 6 +++++- library/compiler-builtins/ci/script.sh | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index aecd54618c0..dee71f7022f 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -62,17 +62,8 @@ matrix: - qemu-user-static - env: TARGET=powerpc64le-unknown-linux-gnu os: linux - dist: trusty services: docker sudo: required - addons: - apt: - packages: - - binfmt-support - - gcc-powerpc64le-linux-gnu - - libc6-ppc64el-cross - - libc6-dev-ppc64el-cross - - qemu-user - env: TARGET=x86_64-apple-darwin os: osx - env: TARGET=x86_64-unknown-linux-gnu diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index 79af908946c..80a1023b3c3 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -25,7 +25,11 @@ install_c_toolchain() { case $TARGET in aarch64-unknown-linux-gnu) sudo apt-get install -y --no-install-recommends \ - gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross + gcc-aarch64-linux-gnu libc6-dev-arm64-cross + ;; + powerpc64-unknown-linux-gnu) + sudo apt-get install -y --no-install-recommends \ + gcc-powerpc64le-linux-gnu libc6-dev-ppc64le-cross ;; *) ;; diff --git a/library/compiler-builtins/ci/script.sh b/library/compiler-builtins/ci/script.sh index b3f7c17a3e5..1013208bb9d 100644 --- a/library/compiler-builtins/ci/script.sh +++ b/library/compiler-builtins/ci/script.sh @@ -36,9 +36,9 @@ main() { docker run \ -e TARGET=$TARGET \ -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ - -v $(pwd)/ci:/mnt \ + -v $(pwd):/mnt \ ubuntu:16.04 \ - sh -c "bash /mnt/install.sh; bash /mnt/script.sh" + sh -c "cd /mnt; bash ci/install.sh; bash ci/script.sh" else build run_tests From 3d3248119a505d26432e60c892adba4b56de1616 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 20:45:46 -0500 Subject: [PATCH 05/17] enable docker --- library/compiler-builtins/.travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index dee71f7022f..6d3d4311a40 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -62,7 +62,8 @@ matrix: - qemu-user-static - env: TARGET=powerpc64le-unknown-linux-gnu os: linux - services: docker + services: + - docker sudo: required - env: TARGET=x86_64-apple-darwin os: osx From 87004d454cdef106a7df67054117bae3fd4c100b Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 20:53:33 -0500 Subject: [PATCH 06/17] don't recursively call docker --- library/compiler-builtins/.travis.yml | 3 +-- library/compiler-builtins/ci/env.sh | 4 +++- library/compiler-builtins/ci/script.sh | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index 6d3d4311a40..dee71f7022f 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -62,8 +62,7 @@ matrix: - qemu-user-static - env: TARGET=powerpc64le-unknown-linux-gnu os: linux - services: - - docker + services: docker sudo: required - env: TARGET=x86_64-apple-darwin os: osx diff --git a/library/compiler-builtins/ci/env.sh b/library/compiler-builtins/ci/env.sh index ed4e1b0b651..7458372baf8 100644 --- a/library/compiler-builtins/ci/env.sh +++ b/library/compiler-builtins/ci/env.sh @@ -29,7 +29,9 @@ case $TARGET in export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu ;; powerpc64le-unknown-linux-gnu) - export DOCKER=y + if [[ -z $DOCKER ]]; then + export DOCKER=y + fi export PREFIX=powerpc64le-linux-gnu- export QEMU=qemu-ppc64le export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu diff --git a/library/compiler-builtins/ci/script.sh b/library/compiler-builtins/ci/script.sh index 1013208bb9d..1e23656791b 100644 --- a/library/compiler-builtins/ci/script.sh +++ b/library/compiler-builtins/ci/script.sh @@ -32,8 +32,9 @@ inspect() { } main() { - if [[ $DOCKER ]]; then + if [[ $DOCKER == "y" ]]; then docker run \ + -e DOCKER=n \ -e TARGET=$TARGET \ -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ -v $(pwd):/mnt \ @@ -44,7 +45,6 @@ main() { run_tests inspect fi - } main From f31fd01713df99e654a3faf40293dcdbc783b544 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:02:07 -0500 Subject: [PATCH 07/17] set PATH inside docker --- library/compiler-builtins/ci/script.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/compiler-builtins/ci/script.sh b/library/compiler-builtins/ci/script.sh index 1e23656791b..56625fafc54 100644 --- a/library/compiler-builtins/ci/script.sh +++ b/library/compiler-builtins/ci/script.sh @@ -39,7 +39,10 @@ main() { -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ -v $(pwd):/mnt \ ubuntu:16.04 \ - sh -c "cd /mnt; bash ci/install.sh; bash ci/script.sh" + sh -c 'cd /mnt; + export PATH="$PATH:$HOME/.cargo/bin"; + bash ci/install.sh; + bash ci/script.sh' else build run_tests From ed2f8c937ea28ec1ce5f3b249c2ef4643a039426 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:14:04 -0500 Subject: [PATCH 08/17] don't skip install phase inside docker --- library/compiler-builtins/ci/install.sh | 2 +- library/compiler-builtins/ci/script.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index 80a1023b3c3..69f6ebcf36d 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -62,7 +62,7 @@ EOF } main() { - if [[ -z $DOCKER ]]; then + if [[ ${DOCKER:-n} != "y" ]]; then install_qemu install_binutils install_c_toolchain diff --git a/library/compiler-builtins/ci/script.sh b/library/compiler-builtins/ci/script.sh index 56625fafc54..4a6dce7a8a9 100644 --- a/library/compiler-builtins/ci/script.sh +++ b/library/compiler-builtins/ci/script.sh @@ -39,7 +39,8 @@ main() { -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ -v $(pwd):/mnt \ ubuntu:16.04 \ - sh -c 'cd /mnt; + sh -c 'set -ex; + cd /mnt; export PATH="$PATH:$HOME/.cargo/bin"; bash ci/install.sh; bash ci/script.sh' From f9d1455b29959b64c0652e7af6cac326d4e594e0 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:20:46 -0500 Subject: [PATCH 09/17] install curl inside docker --- library/compiler-builtins/ci/install.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index 69f6ebcf36d..3c87ddb6ad3 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -2,6 +2,13 @@ set -ex . $(dirname $0)/env.sh +install_deps() { + if [[ ${DOCKER} == "y" ]]; then + apt-get install -y --no-install-recommends \ + ca-certificates curl + fi +} + install_qemu() { case $TARGET in powerpc64-unknown-linux-gnu) @@ -63,6 +70,7 @@ EOF main() { if [[ ${DOCKER:-n} != "y" ]]; then + install_deps install_qemu install_binutils install_c_toolchain From eb5a86b261948f4a6e8407203fc69ebce3ce5ae1 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:27:08 -0500 Subject: [PATCH 10/17] really install curl inside docker --- library/compiler-builtins/ci/env.sh | 1 + library/compiler-builtins/ci/install.sh | 2 +- library/compiler-builtins/ci/script.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/library/compiler-builtins/ci/env.sh b/library/compiler-builtins/ci/env.sh index 7458372baf8..f1aa4fe2cd2 100644 --- a/library/compiler-builtins/ci/env.sh +++ b/library/compiler-builtins/ci/env.sh @@ -29,6 +29,7 @@ case $TARGET in export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu ;; powerpc64le-unknown-linux-gnu) + # NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no) if [[ -z $DOCKER ]]; then export DOCKER=y fi diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index 3c87ddb6ad3..c545eedf1a5 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -3,7 +3,7 @@ set -ex . $(dirname $0)/env.sh install_deps() { - if [[ ${DOCKER} == "y" ]]; then + if [[ ${DOCKER} == "i" ]]; then apt-get install -y --no-install-recommends \ ca-certificates curl fi diff --git a/library/compiler-builtins/ci/script.sh b/library/compiler-builtins/ci/script.sh index 4a6dce7a8a9..65d74a332a2 100644 --- a/library/compiler-builtins/ci/script.sh +++ b/library/compiler-builtins/ci/script.sh @@ -34,7 +34,7 @@ inspect() { main() { if [[ $DOCKER == "y" ]]; then docker run \ - -e DOCKER=n \ + -e DOCKER=i \ -e TARGET=$TARGET \ -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ -v $(pwd):/mnt \ From ce538c66184576694e2cc0ccfe62aad2b20cc3d2 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:32:12 -0500 Subject: [PATCH 11/17] apt-get update --- library/compiler-builtins/ci/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index c545eedf1a5..d7eac145dfb 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -4,6 +4,7 @@ set -ex install_deps() { if [[ ${DOCKER} == "i" ]]; then + apt-get update apt-get install -y --no-install-recommends \ ca-certificates curl fi From d24e0e07a32d767495f84645a3747431cecd3614 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:37:48 -0500 Subject: [PATCH 12/17] fix installation of c toolchain --- library/compiler-builtins/ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index d7eac145dfb..2635c8984aa 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -35,7 +35,7 @@ install_c_toolchain() { sudo apt-get install -y --no-install-recommends \ gcc-aarch64-linux-gnu libc6-dev-arm64-cross ;; - powerpc64-unknown-linux-gnu) + powerpc64le-unknown-linux-gnu) sudo apt-get install -y --no-install-recommends \ gcc-powerpc64le-linux-gnu libc6-dev-ppc64le-cross ;; From 5e6dc52747f8aa5d3a6542c51b801a61e325f0fa Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:43:01 -0500 Subject: [PATCH 13/17] no sudo --- library/compiler-builtins/ci/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index 2635c8984aa..0000e457562 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -36,8 +36,8 @@ install_c_toolchain() { gcc-aarch64-linux-gnu libc6-dev-arm64-cross ;; powerpc64le-unknown-linux-gnu) - sudo apt-get install -y --no-install-recommends \ - gcc-powerpc64le-linux-gnu libc6-dev-ppc64le-cross + apt-get install -y --no-install-recommends \ + gcc-powerpc64le-linux-gnu libc6-dev-ppc64le-cross ;; *) ;; From 32758212c87a74a15c4774aee11ddebb032b44cd Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:43:13 -0500 Subject: [PATCH 14/17] put first in the queue --- library/compiler-builtins/.travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index dee71f7022f..7f90c44ad75 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -3,6 +3,10 @@ sudo: false matrix: include: + - env: TARGET=powerpc64le-unknown-linux-gnu + os: linux + services: docker + sudo: required - env: TARGET=aarch64-unknown-linux-gnu os: linux dist: trusty @@ -60,10 +64,6 @@ matrix: - libc6-powerpc-cross - libc6-dev-powerpc-cross - qemu-user-static - - env: TARGET=powerpc64le-unknown-linux-gnu - os: linux - services: docker - sudo: required - env: TARGET=x86_64-apple-darwin os: osx - env: TARGET=x86_64-unknown-linux-gnu From 378bab2a11f4d6edb74f708b66f568e6914adce4 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:46:24 -0500 Subject: [PATCH 15/17] fix package name --- library/compiler-builtins/ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index 0000e457562..867ac00e743 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -37,7 +37,7 @@ install_c_toolchain() { ;; powerpc64le-unknown-linux-gnu) apt-get install -y --no-install-recommends \ - gcc-powerpc64le-linux-gnu libc6-dev-ppc64le-cross + gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross ;; *) ;; From c3a501ec3b84a6927097a4389c1b1ecebeb0ac60 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:49:31 -0500 Subject: [PATCH 16/17] fix target name in case --- library/compiler-builtins/ci/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh index 867ac00e743..ae94e949d24 100644 --- a/library/compiler-builtins/ci/install.sh +++ b/library/compiler-builtins/ci/install.sh @@ -12,9 +12,9 @@ install_deps() { install_qemu() { case $TARGET in - powerpc64-unknown-linux-gnu) - sudo apt-get install -y --no-install-recommends \ - qemu-user + powerpc64le-unknown-linux-gnu) + apt-get install -y --no-install-recommends \ + qemu-user ;; esac } From 808ff7d4696afcebc790f5a18ff67481917b78fc Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:57:18 -0500 Subject: [PATCH 17/17] allow failure --- library/compiler-builtins/.travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index 7f90c44ad75..3ae43eba3f8 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -3,10 +3,6 @@ sudo: false matrix: include: - - env: TARGET=powerpc64le-unknown-linux-gnu - os: linux - services: docker - sudo: required - env: TARGET=aarch64-unknown-linux-gnu os: linux dist: trusty @@ -64,6 +60,10 @@ matrix: - libc6-powerpc-cross - libc6-dev-powerpc-cross - qemu-user-static + - env: TARGET=powerpc64le-unknown-linux-gnu + os: linux + services: docker + sudo: required - env: TARGET=x86_64-apple-darwin os: osx - env: TARGET=x86_64-unknown-linux-gnu @@ -72,6 +72,9 @@ matrix: # FIXME(#2) - env: TARGET=armv7-unknown-linux-gnueabihf os: linux + # FIXME QEMU blows up + - env: TARGET=powerpc64le-unknown-linux-gnu + os: linux before_install: - export PATH="$PATH:$HOME/.cargo/bin"