Unified Diff: vagrant-test.sh
Issue 29448564:
Issue 5277 - Prepare Vagrant files for CI (Closed)
Patch Set: see the changes in commit message https://github.com/4ntoine/libadblockplus-android-ci/commit/d44b6f71a6efb02d46fb594e823c6e810ba79a4f
Created May 25, 2017, 1:50 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« vagrant-provision.sh ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: vagrant-test.sh |
| diff --git a/vagrant-test.sh b/vagrant-test.sh |
| index 9078f9676dee521c0559b8cb262e661a14f2b561..5ad066ff33b2d7775ce409bce3e1aac1897828ec 100755 |
| --- a/vagrant-test.sh |
| +++ b/vagrant-test.sh |
| @@ -2,14 +2,23 @@ |
| set -e |
| export ANDROID_HOME="/home/vagrant/android-sdk-linux" |
| +mkdir -p "/home/vagrant/build/temp" |
| +export ANDROID_TMP="/home/vagrant/build/temp" |
| + |
| +cd ~/build/src/ |
| -cd ~/build/libadblockplus-android-tests |
| # Start emulator |
| -/vagrant/vagrant-emulator.sh start |
| +echo "Starting emulator for testing..." |
| +/vagrant/vagrant-emulator.sh start avd-armeabi-v7a || echo "Failed to start emulator" |
| +#/vagrant/vagrant-emulator.sh start avd-x86 |
| + |
| # Build, install and run tests |
| -ant instrument install test |
| -# TODO ant does not recognize failed tests |
| +echo "Building and running tests..." |
| +./gradlew connectedDebugAndroidTest || echo "Failed to build the tests of tests failed" |
| -# Stop emulator |
| -/vagrant/vagrant-emulator.sh stop |
| +echo "Done" |
| +# Stop emulator |
| +echo "Stopping emulator for testing..." |
| +/vagrant/vagrant-emulator.sh stop avd-armeabi-v7a |
| +#/vagrant/vagrant-emulator.sh stop avd-x86 |
« no previous file with comments
|
« vagrant-provision.sh ('k')
|
no next file »
|
no next file with comments »
