From 0abb6e20e6eae6d2ae461644965aa94b379f202e Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 11 Dec 2016 11:17:21 -0500 Subject: [PATCH 1/4] fix the test suite for the thumb targets --- library/compiler-builtins/.travis.yml | 5 +++++ library/compiler-builtins/ci/run.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index 7ca18a915141..e5fcf195a806 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -22,10 +22,15 @@ matrix: - env: TARGET=powerpc-unknown-linux-gnu - env: TARGET=powerpc64-unknown-linux-gnu - env: TARGET=powerpc64le-unknown-linux-gnu + # NOTE(nightly-2016-12-05) work around for rust-lang/rust#38281 - env: TARGET=thumbv6m-none-eabi + rust: nightly-2016-12-05 - env: TARGET=thumbv7em-none-eabi + rust: nightly-2016-12-05 - env: TARGET=thumbv7em-none-eabihf + rust: nightly-2016-12-05 - env: TARGET=thumbv7m-none-eabi + rust: nightly-2016-12-05 - env: TARGET=x86_64-apple-darwin os: osx env: TARGET=x86_64-unknown-linux-gnu diff --git a/library/compiler-builtins/ci/run.sh b/library/compiler-builtins/ci/run.sh index 0159e2389130..221748fd4886 100755 --- a/library/compiler-builtins/ci/run.sh +++ b/library/compiler-builtins/ci/run.sh @@ -1,4 +1,4 @@ -set -e +set -ex # Test our implementation case $1 in From 8a415ef044345d42e090773861cb7ea30aeee60b Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 11 Dec 2016 11:33:21 -0500 Subject: [PATCH 2/4] pin all the targets to nightly-2016-12-05 --- library/compiler-builtins/.travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index e5fcf195a806..156dbe0c9d82 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -1,7 +1,8 @@ cache: cargo dist: trusty language: rust -rust: nightly +# NOTE(nightly-2016-12-05) work around for rust-lang/rust#38281 +rust: nightly-2016-12-05 services: docker sudo: required @@ -22,15 +23,10 @@ matrix: - env: TARGET=powerpc-unknown-linux-gnu - env: TARGET=powerpc64-unknown-linux-gnu - env: TARGET=powerpc64le-unknown-linux-gnu - # NOTE(nightly-2016-12-05) work around for rust-lang/rust#38281 - env: TARGET=thumbv6m-none-eabi - rust: nightly-2016-12-05 - env: TARGET=thumbv7em-none-eabi - rust: nightly-2016-12-05 - env: TARGET=thumbv7em-none-eabihf - rust: nightly-2016-12-05 - env: TARGET=thumbv7m-none-eabi - rust: nightly-2016-12-05 - env: TARGET=x86_64-apple-darwin os: osx env: TARGET=x86_64-unknown-linux-gnu From fc81b547e612afc64a1f9ae6ea2d2fad6dbe1205 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 11 Dec 2016 14:58:05 -0500 Subject: [PATCH 3/4] work around rust-lang/cargo#3340 --- library/compiler-builtins/.travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml index 156dbe0c9d82..61b17134072c 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -44,6 +44,8 @@ install: esac script: + # work around rust-lang/cargo#3340 + - export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt - cargo generate-lockfile - if [[ $TRAVIS_OS_NAME = "linux" ]]; then sudo apt-get remove -y qemu-user-static && From b90b5107a7a8ea66f8ab635b105413c396ea7782 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 11 Dec 2016 15:26:18 -0500 Subject: [PATCH 4/4] don't set SSL_CERT_FILE for OSX --- 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 61b17134072c..82ca5d8222c5 100644 --- a/library/compiler-builtins/.travis.yml +++ b/library/compiler-builtins/.travis.yml @@ -45,7 +45,8 @@ install: script: # work around rust-lang/cargo#3340 - - export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt + - test "$TRAVIS_OS_NAME" = "osx" || + export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt - cargo generate-lockfile - if [[ $TRAVIS_OS_NAME = "linux" ]]; then sudo apt-get remove -y qemu-user-static &&