From 09935e24eb7b2e0f12827fc0e69d96e5633f8fed Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 11:48:51 -0500 Subject: [PATCH 1/3] don't run tests on targets that have QEMU issues cc #2 --- .travis.yml | 13 ------------- ci/env.sh | 15 +++++++++++++-- ci/script.sh | 8 ++++++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index dacfd70..c1b6dd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/ci/env.sh b/ci/env.sh index fb3d1ef..ee3bd16 100644 --- a/ci/env.sh +++ b/ci/env.sh @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/ci/script.sh b/ci/script.sh index 65d74a3..16b6e76 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -14,9 +14,13 @@ 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-* + if [[ -z $DONT_RUN_TESTS ]]; then + $QEMU target/**/release/rustc_builtins-* + fi else cargo test --target $TARGET cargo test --target $TARGET --release From d13ff6d7106a3b1a2dc179f9d269074baee90fc0 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 11:53:49 -0500 Subject: [PATCH 2/3] fix armv7 --- ci/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/script.sh b/ci/script.sh index 16b6e76..c0074ec 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -21,7 +21,7 @@ run_tests() { if [[ -z $DONT_RUN_TESTS ]]; then $QEMU target/**/release/rustc_builtins-* fi - else + else if [[ -z $DONT_RUN_TESTS ]]; then cargo test --target $TARGET cargo test --target $TARGET --release fi From ff334e9b895f03e0d3d52427d6a5815c6b4c32b7 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 12:04:24 -0500 Subject: [PATCH 3/3] fix bash syntax --- ci/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/script.sh b/ci/script.sh index c0074ec..099e42e 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -21,7 +21,7 @@ run_tests() { if [[ -z $DONT_RUN_TESTS ]]; then $QEMU target/**/release/rustc_builtins-* fi - else if [[ -z $DONT_RUN_TESTS ]]; then + elif [[ -z $DONT_RUN_TESTS ]]; then cargo test --target $TARGET cargo test --target $TARGET --release fi