summaryrefslogtreecommitdiff
path: root/ci/run.sh
diff options
context:
space:
mode:
authorMarco A L Barbosa <malbarbo@gmail.com>2017-04-19 10:59:04 -0300
committerMarco A L Barbosa <malbarbo@gmail.com>2017-04-19 10:59:04 -0300
commit0b05b2a845b6249d2903f899e1b2532b93452b71 (patch)
treee0b900f19826338eb7058ffa6d03d1331afd2e1c /ci/run.sh
parent05a2d197356ef253dfd985166576619ac9b6947f (diff)
downloadrust-libc-0b05b2a845b6249d2903f899e1b2532b93452b71.tar.gz
Enable kvm in docker images if available
Diffstat (limited to 'ci/run.sh')
-rwxr-xr-xci/run.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/ci/run.sh b/ci/run.sh
index 1b6e0fb1d4..f854eb6faa 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -111,7 +111,11 @@ case "$TARGET" in
# 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 &
+ accel="-no-accel"
+ if emulator -accel-check; then
+ accel=""
+ fi
+ emulator @$arch -no-window $accel &
adb wait-for-device
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