From c1ef69f2a01112269ad93b42d8106628f53000cf 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 --- .travis.yml | 5 +++++ ci/run.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ca18a9..e5fcf19 100644 --- a/.travis.yml +++ b/.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/ci/run.sh b/ci/run.sh index 0159e23..221748f 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -1,4 +1,4 @@ -set -e +set -ex # Test our implementation case $1 in From c19d6764f3113cf2aef9bf627098776dfb0573e2 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 --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5fcf19..156dbe0 100644 --- a/.travis.yml +++ b/.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 c9155e3c363e82ec1b22e900b3cd300e076d5cb1 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 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 156dbe0..61b1713 100644 --- a/.travis.yml +++ b/.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 6c4647ef11a4e45f3a8ad2a2ee3653cbda39271b 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 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61b1713..82ca5d8 100644 --- a/.travis.yml +++ b/.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 &&