diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-03-13 12:24:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-14 03:34:39 (GMT) |
| commit | 99e37c2560ecb1cc44bb743a2e4aaaedb5da1a90 (patch) | |
| tree | 076fe8d2aca0a40245948b5e40bd66a82845a3df /t/lib-git-p4.sh | |
| parent | 3bc2702b883030b138a8c7585d7bc9adb4b4a399 (diff) | |
| download | git-99e37c2560ecb1cc44bb743a2e4aaaedb5da1a90.zip git-99e37c2560ecb1cc44bb743a2e4aaaedb5da1a90.tar.gz git-99e37c2560ecb1cc44bb743a2e4aaaedb5da1a90.tar.bz2 | |
git p4 test: use 'test_atexit' to kill p4d and the watchdog process
Use 'test_atexit' to run cleanup commands to stop 'p4d' at the end of
the test script or upon interrupt or failure, as it is shorter,
simpler, and more robust than registering such cleanup commands in the
trap on EXIT in the test scripts.
Note that one of the test scripts, 't9801-git-p4-branch.sh', stops and
then re-starts 'p4d' twice in the middle of the script; take care that
the cleanup functions to stop 'p4d' are only registered once.
Note also that 'git p4' tests invoke different functions in the trap
on EXIT ('cleanup') and in the last test before 'test_done'
('kill_p4d'). Register both of these functions with 'test_atexit' for
now, and a a later patch in this series will then clean up the
redundancy.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-git-p4.sh')
| -rw-r--r-- | t/lib-git-p4.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index b3be3ba..958e33b 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -74,7 +74,6 @@ cleanup () { kill -9 $(cat "$pidfile") 2>/dev/null && exit 255 fi } -trap cleanup EXIT # git p4 submit generates a temp file, which will # not get cleaned up if the submission fails. Don't @@ -82,7 +81,16 @@ trap cleanup EXIT TMPDIR="$TRASH_DIRECTORY" export TMPDIR +registered_stop_p4d_atexit_handler= start_p4d () { + # One of the test scripts stops and then re-starts p4d. + # Don't register and then run the same atexit handlers several times. + if test -z "$registered_stop_p4d_atexit_handler" + then + test_atexit 'kill_p4d; cleanup' + registered_stop_p4d_atexit_handler=AlreadyDone + fi + mkdir -p "$db" "$cli" "$git" && rm -f "$pidfile" && ( |