M-Labs
/
compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #125 - japaric:fix-thumb, r=japaric 

fix the test suite for the thumb targets
This commit is contained in:
bors 2016-12-11 20:49:57 +00:00
parent 8bb7795459 6c4647ef11
commit 386683c91f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -1,7 +1,8 @@
cache: cargo cache: cargo
dist: trusty dist: trusty
language: rust language: rust
rust: nightly # NOTE(nightly-2016-12-05) work around for rust-lang/rust#38281
rust: nightly-2016-12-05
services: docker services: docker
sudo: required sudo: required
@ -43,6 +44,9 @@ install:
esac esac
script: script:
# work around rust-lang/cargo#3340
- test "$TRAVIS_OS_NAME" = "osx" ||
export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
- cargo generate-lockfile - cargo generate-lockfile
- if [[ $TRAVIS_OS_NAME = "linux" ]]; then - if [[ $TRAVIS_OS_NAME = "linux" ]]; then
sudo apt-get remove -y qemu-user-static && sudo apt-get remove -y qemu-user-static &&

2
ci/run.sh
View File

@ -1,4 +1,4 @@
set -e set -ex
# Test our implementation # Test our implementation
case $1 in case $1 in