diff options
| author | Daniel Mueller <deso@posteo.net> | 2017-05-29 14:07:12 -0700 |
|---|---|---|
| committer | Daniel Mueller <deso@posteo.net> | 2017-05-29 14:07:12 -0700 |
| commit | 684c4574c09a6f2cc5a208e4505e9306602b4abc (patch) | |
| tree | daaac715140748c82f801f2e4047c57780689bc0 /libc/ci/run.sh | |
| parent | 436915453f7474117234aa0cedab6f97b3b3575f (diff) | |
| download | nitrocli-684c4574c09a6f2cc5a208e4505e9306602b4abc.tar.gz nitrocli-684c4574c09a6f2cc5a208e4505e9306602b4abc.tar.bz2 | |
Update libc crate to 0.2.23
The 'libc' create got a couple of updates. This change imports the new
code and bumps the version to use.
Import subrepo libc/:libc at 7db3fd570dfb41a38fb17116e93679307178103a
Diffstat (limited to 'libc/ci/run.sh')
| -rwxr-xr-x | libc/ci/run.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libc/ci/run.sh b/libc/ci/run.sh index 1b6e0fb..3ddc7b3 100755 --- a/libc/ci/run.sh +++ b/libc/ci/run.sh @@ -105,13 +105,20 @@ case "$TARGET" in esac case "$TARGET" in + # Android emulator for x86_64 does not work on travis (missing hardware + # acceleration). Tests are run on case *). See ci/android-sysimage.sh for + # informations about how tests are run. 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 & + 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 |