Skip to content

Commit 386683c

Browse files
committed
Auto merge of #125 - japaric:fix-thumb, r=japaric
fix the test suite for the thumb targets
2 parents 8bb7795 + 6c4647e commit 386683c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.travis.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cache: cargo
22
dist: trusty
33
language: rust
4-
rust: nightly
4+
# NOTE(nightly-2016-12-05) work around for rust-lang/rust#38281
5+
rust: nightly-2016-12-05
56
services: docker
67
sudo: required
78

@@ -43,6 +44,9 @@ install:
4344
esac
4445

4546
script:
47+
# work around rust-lang/cargo#3340
48+
- test "$TRAVIS_OS_NAME" = "osx" ||
49+
export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
4650
- cargo generate-lockfile
4751
- if [[ $TRAVIS_OS_NAME = "linux" ]]; then
4852
sudo apt-get remove -y qemu-user-static &&

ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set -e
1+
set -ex
22

33
# Test our implementation
44
case $1 in

0 commit comments

Comments
 (0)