From 99e37c2560ecb1cc44bb743a2e4aaaedb5da1a90 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 13 Mar 2019 13:24:15 +0100 Subject: git p4 test: use 'test_atexit' to kill p4d and the watchdog process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- t/t9829-git-p4-jobs.sh | 4 ---- 1 file changed, 4 deletions(-) (limited to 't/t9829-git-p4-jobs.sh') diff --git a/t/t9829-git-p4-jobs.sh b/t/t9829-git-p4-jobs.sh index 971aeeea1f..88cfb1fcd3 100755 --- a/t/t9829-git-p4-jobs.sh +++ b/t/t9829-git-p4-jobs.sh @@ -92,8 +92,4 @@ test_expect_success 'check log message of changelist with more jobs' ' ) ' -test_expect_success 'kill p4d' ' - kill_p4d -' - test_done -- cgit v1.2.1