Merge branch 'ci-arm' into 'master'

gitlab-ci: Use ARM emulator for API 24 as well

See merge request !447
This commit is contained in:
Hans-Christoph Steiner 2017-03-16 12:03:31 +00:00
commit 09ab4b0051

View File

@ -53,7 +53,7 @@ connected24:
variables:
AVD_SDK: "24"
script:
- emulator64-x86 -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
- emulator64-arm -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
- ./tools/wait-for-emulator
- adb shell input keyevent 82 &
- export EXITVALUE=0