summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Yu <dyu@google.com>2024-02-14 00:23:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-02-14 00:23:51 +0000
commitc69d082a2b4e0102071279ff7aad30dd22eade8e (patch)
tree86ac82f2fbe1bdd0d54ada59f21e6b3efcd2ed5e
parent187498c2cfd5ef5d8d72c62f5258a1138262317b (diff)
downloadadt-infra-c69d082a2b4e0102071279ff7aad30dd22eade8e.tar.gz
Revert "Fix empty file not being found causing rm command to fail."
This reverts commit 187498c2cfd5ef5d8d72c62f5258a1138262317b. Reason for revert: Test failures are now reported as errors in the dashboard. This is an unexpected consequence. Previously the exit code was ignored. Reverting to old behavior. Change-Id: I3adac967a261beaa282b1251d9870b7264219d68
-rwxr-xr-xemu_test/utils/run_boot_test.sh2
-rwxr-xr-xemu_test/utils/run_ui_test.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/emu_test/utils/run_boot_test.sh b/emu_test/utils/run_boot_test.sh
index 0560e2fb..c8511d00 100755
--- a/emu_test/utils/run_boot_test.sh
+++ b/emu_test/utils/run_boot_test.sh
@@ -17,7 +17,7 @@ function cleanup() {
exit_code=$?
log "deactivate virtualenv"
deactivate_virtualenv
- find $SESSION_DIR -size 0 -print0 | xargs -0 rm -f --
+ find $SESSION_DIR -size 0 -print0 |xargs -0 rm --
[ $exit_code -eq 0 ] && echo "Boot test completed" || echo "Error in boot test"
}
diff --git a/emu_test/utils/run_ui_test.sh b/emu_test/utils/run_ui_test.sh
index c5322f37..d462778c 100755
--- a/emu_test/utils/run_ui_test.sh
+++ b/emu_test/utils/run_ui_test.sh
@@ -18,7 +18,7 @@ function cleanup() {
rm -rf $SNAPSHOT_DIR
- find $SESSION_DIR -size 0 -print0 | xargs -0 rm -f --
+ find $SESSION_DIR -size 0 -print0 |xargs -0 rm --
[ $exit_code -eq 0 ] && echo "UI test completed" || echo "Error in UI test"
}