Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't run tests on targets that have QEMU issues #21

Merged
merged 3 commits into from
Aug 9, 2016
Merged

don't run tests on targets that have QEMU issues #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09935e2
don't run tests on targets that have QEMU issues
Aug 9, 2016
d13ff6d
fix armv7
Aug 9, 2016
ff334e9
fix bash syntax
Aug 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,6 @@ matrix:
os: osx
- env: TARGET=x86_64-unknown-linux-gnu
os: linux
allow_failures:
# FIXME(#2)
- env: TARGET=armv7-unknown-linux-gnueabihf
os: linux
# FIXME QEMU blows up
- env: TARGET=mips-unknown-linux-gnu
os: linux
# FIXME QEMU blows up
- env: TARGET=powerpc64-unknown-linux-gnu
os: linux
# FIXME QEMU blows up
- env: TARGET=powerpc64le-unknown-linux-gnu
os: linux

before_install:
- export PATH="$PATH:$HOME/.cargo/bin"
Expand Down
15 changes: 13 additions & 2 deletions ci/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,19 @@ case $TARGET in
export PREFIX=arm-linux-gnueabi-
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
;;
arm*-unknown-linux-gnueabihf)
arm-unknown-linux-gnueabihf)
export PREFIX=arm-linux-gnueabihf-
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
;;
armv7-unknown-linux-gnueabihf)
# See #2
export DONT_RUN_TESTS=y
export PREFIX=arm-linux-gnueabihf-
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
;;
mips-unknown-linux-gnu)
# See #2
export DONT_RUN_TESTS=y
# NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no)
if [[ -z $DOCKER ]]; then
export DOCKER=y
Expand All @@ -34,7 +42,6 @@ case $TARGET in
export QEMU_LD_PREFIX=/usr/mips-linux-gnu
;;
mipsel-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
Expand All @@ -47,6 +54,8 @@ case $TARGET in
export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu
;;
powerpc64-unknown-linux-gnu)
# See #2
export DONT_RUN_TESTS=y
if [[ -z $DOCKER ]]; then
export DOCKER=y
fi
Expand All @@ -55,6 +64,8 @@ case $TARGET in
export QEMU_LD_PREFIX=/usr/powerpc64-linux-gnu
;;
powerpc64le-unknown-linux-gnu)
# See #2
export DONT_RUN_TESTS=y
if [[ -z $DOCKER ]]; then
export DOCKER=y
fi
Expand Down
10 changes: 7 additions & 3 deletions ci/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ run_tests() {

if [[ $QEMU ]]; then
cargo test --target $TARGET --no-run
$QEMU target/**/debug/rustc_builtins-*
if [[ -z $DONT_RUN_TESTS ]]; then
$QEMU target/**/debug/rustc_builtins-*
fi
cargo test --target $TARGET --release --no-run
$QEMU target/**/release/rustc_builtins-*
else
if [[ -z $DONT_RUN_TESTS ]]; then
$QEMU target/**/release/rustc_builtins-*
fi
elif [[ -z $DONT_RUN_TESTS ]]; then
cargo test --target $TARGET
cargo test --target $TARGET --release
fi
Expand Down