isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

build.sh: Do not abort when uninstall fails

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-07-23 10:59:18 -04:00
parent 89400e281e
commit 43be70b27c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.sh
View File

@@ -141,6 +141,10 @@ install_apk() {
} }
install_test_apk() { install_test_apk() {
log_info "Uninstalling existing test APK"
$ADB uninstall ${PACKAGE_NAME}.test
log_info "Installing test APK"
$ADB install -r ${OUTPUTS_DIR}/apk/androidTest/debug/uhabits-android-debug-androidTest.apk || fail $ADB install -r ${OUTPUTS_DIR}/apk/androidTest/debug/uhabits-android-debug-androidTest.apk || fail
} }
@@ -195,7 +199,7 @@ run_jvm_tests() {
uninstall_test_apk() { uninstall_test_apk() {
log_info "Uninstalling test APK" log_info "Uninstalling test APK"
$ADB uninstall ${PACKAGE_NAME}.test || fail $ADB uninstall ${PACKAGE_NAME}.test
} }
fetch_images() { fetch_images() {
@@ -222,7 +226,6 @@ run_local_tests() {
build_instrumentation_apk build_instrumentation_apk
install_test_butler install_test_butler
install_apk install_apk
uninstall_test_apk
install_test_apk install_test_apk
run_instrumented_tests run_instrumented_tests
parse_instrumentation_results parse_instrumentation_results