summaryrefslogtreecommitdiff
path: root/ci/run.sh
diff options
context:
space:
mode:
authorMarco A L Barbosa <malbarbo@gmail.com>2017-02-23 16:08:29 -0300
committerMarco A L Barbosa <malbarbo@gmail.com>2017-02-23 16:08:29 -0300
commit599eec37814e85253923fc3d66703ebd9e7ce650 (patch)
tree8f93394c244e49cff9891225a831234e13c13104 /ci/run.sh
parent16832447b402c0e6801877ff2ec044993c1862eb (diff)
downloadrust-libc-599eec37814e85253923fc3d66703ebd9e7ce650.tar.gz
Add test support for {aarch64, i686}-linux-android
Diffstat (limited to 'ci/run.sh')
-rwxr-xr-xci/run.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/ci/run.sh b/ci/run.sh
index d33af30fd9..1b6e0fb1d4 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -105,11 +105,16 @@ case "$TARGET" in
esac
case "$TARGET" in
- arm-linux-androideabi)
- emulator @arm-21 -no-window &
+ arm-linux-androideabi | aarch64-linux-android | i686-linux-android)
+ # set SHELL so android can detect a 64bits system, see
+ # http://stackoverflow.com/a/41789144
+ # https://issues.jenkins-ci.org/browse/JENKINS-26930?focusedCommentId=230791&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-230791
+ export SHELL=/bin/dash
+ arch=$(echo $TARGET | cut -d- -f1)
+ emulator @$arch -no-window -no-accel &
adb wait-for-device
- adb push $CARGO_TARGET_DIR/$TARGET/debug/libc-test /data/libc-test
- adb shell /data/libc-test 2>&1 | tee /tmp/out
+ adb push $CARGO_TARGET_DIR/$TARGET/debug/libc-test /data/local/tmp/libc-test
+ adb shell /data/local/tmp/libc-test 2>&1 | tee /tmp/out
grep "^PASSED .* tests" /tmp/out
;;