Skip to content

Commit 83d5ee8

Browse files
author
Jorge Aparicio
committed
don't run tests on targets that have QEMU issues
cc #2
1 parent c305565 commit 83d5ee8

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

ci/env.sh

+13-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,19 @@ case $TARGET in
2020
export PREFIX=arm-linux-gnueabi-
2121
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
2222
;;
23-
arm*-unknown-linux-gnueabihf)
23+
arm-unknown-linux-gnueabihf)
24+
export PREFIX=arm-linux-gnueabihf-
25+
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
26+
;;
27+
armv7-unknown-linux-gnueabihf)
28+
# See #2
29+
export DONT_RUN_TESTS=y
2430
export PREFIX=arm-linux-gnueabihf-
2531
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
2632
;;
2733
mips-unknown-linux-gnu)
34+
# See #2
35+
export DONT_RUN_TESTS=y
2836
# NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no)
2937
if [[ -z $DOCKER ]]; then
3038
export DOCKER=y
@@ -34,7 +42,6 @@ case $TARGET in
3442
export QEMU_LD_PREFIX=/usr/mips-linux-gnu
3543
;;
3644
mipsel-unknown-linux-gnu)
37-
# NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no)
3845
if [[ -z $DOCKER ]]; then
3946
export DOCKER=y
4047
fi
@@ -47,6 +54,8 @@ case $TARGET in
4754
export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu
4855
;;
4956
powerpc64-unknown-linux-gnu)
57+
# See #2
58+
export DONT_RUN_TESTS=y
5059
if [[ -z $DOCKER ]]; then
5160
export DOCKER=y
5261
fi
@@ -55,6 +64,8 @@ case $TARGET in
5564
export QEMU_LD_PREFIX=/usr/powerpc64-linux-gnu
5665
;;
5766
powerpc64le-unknown-linux-gnu)
67+
# See #2
68+
export DONT_RUN_TESTS=y
5869
if [[ -z $DOCKER ]]; then
5970
export DOCKER=y
6071
fi

ci/script.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ run_tests() {
1414

1515
if [[ $QEMU ]]; then
1616
cargo test --target $TARGET --no-run
17-
$QEMU target/**/debug/rustc_builtins-*
17+
if [[ -z $DONT_RUN_TESTS ]]; then
18+
$QEMU target/**/debug/rustc_builtins-*
19+
fi
1820
cargo test --target $TARGET --release --no-run
19-
$QEMU target/**/release/rustc_builtins-*
21+
if [[ -z $DONT_RUN_TESTS ]]; then
22+
$QEMU target/**/release/rustc_builtins-*
23+
fi
2024
else
2125
cargo test --target $TARGET
2226
cargo test --target $TARGET --release

0 commit comments

Comments
 (0)