undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dt/gc-ignore-old-gc-logs'

Browse Source 
Attempt to allow us notice "fishy" situation where we fail to
remove the temporary directory used during the test.

* dt/gc-ignore-old-gc-logs:
  test-lib: retire $remove_trash variable
  test-lib.sh: do not barf under --debug at the end of the test
  test-lib: abort when can't remove trash directory
This commit is contained in:
Junio C Hamano 2017-05-16 11:51:50 +09:00
commit a0ab83ebd8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/test-lib.sh
View File

@ -761,10 +761,15 @@ test_done () {
say "1..$test_count$skip_all" say "1..$test_count$skip_all"
fi fi
test -d "$remove_trash" && if test -z "$debug"
cd "$(dirname "$remove_trash")" && then
rm -rf "$(basename "$remove_trash")" test -d "$TRASH_DIRECTORY" ||
error "Tests passed but trash directory already removed before test cleanup; aborting"
cd "$TRASH_DIRECTORY/.." &&
rm -fr "$TRASH_DIRECTORY" ||
error "Tests passed but test cleanup failed; aborting"
fi
test_at_end_hook_ test_at_end_hook_
exit 0 ;; exit 0 ;;
@ -919,7 +924,6 @@ case "$TRASH_DIRECTORY" in
/*) ;; # absolute path is good /*) ;; # absolute path is good
*) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;; *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;;
esac esac
test ! -z "$debug" || remove_trash=$TRASH_DIRECTORY
rm -fr "$TRASH_DIRECTORY" || { rm -fr "$TRASH_DIRECTORY" || {
GIT_EXIT_OK=t GIT_EXIT_OK=t
echo >&5 "FATAL: Cannot prepare test area" echo >&5 "FATAL: Cannot prepare test area"