fixup! git-daemon: use test_atexit in the tests

dscho · dscho · commit 4aea72c59f2d · 2018-12-13T15:16:57.000+01:00
Turns out that there are problems with that approach that are totally
not related to Azure Pipelines, so in order to focus on the latter,
let's skip the test_atexit patches for now.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/t/interop/i5500-git-daemon.sh b/t/interop/i5500-git-daemon.sh
@@ -37,4 +37,5 @@ test_expect_success "fetch with $VERSION_B" '
 	test_cmp expect actual
 '
 
+stop_git_daemon
 test_done
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
@@ -13,6 +13,7 @@
 #
 #	test_expect_success ...
 #
+#	stop_git_daemon
 #	test_done
 
 test_tristate GIT_TEST_GIT_DAEMON
@@ -42,7 +43,7 @@ start_git_daemon() {
 
 	mkdir -p "$GIT_DAEMON_DOCUMENT_ROOT_PATH"
 
-	test_atexit 'stop_git_daemon'
+	trap 'code=$?; stop_git_daemon; (exit $code); die' EXIT
 
 	say >&3 "Starting git daemon ..."
 	mkfifo git_daemon_output
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
@@ -211,4 +211,5 @@ test_expect_success FAKENC 'hostname interpolation works after LF-stripping' '
 	test_cmp expect actual
 '
 
+stop_git_daemon
 test_done

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,5 @@ test_expect_success "fetch with $VERSION_B" '`
`37`	`37`	`test_cmp expect actual`
`38`	`38`	`'`
`39`	`39`
	`40`	`+stop_git_daemon`
`40`	`41`	`test_done`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`#`
`14`	`14`	`# test_expect_success ...`
`15`	`15`	`#`
	`16`	`+# stop_git_daemon`
`16`	`17`	`# test_done`
`17`	`18`
`18`	`19`	`test_tristate GIT_TEST_GIT_DAEMON`
`@@ -42,7 +43,7 @@ start_git_daemon() {`
`42`	`43`
`43`	`44`	`mkdir -p "$GIT_DAEMON_DOCUMENT_ROOT_PATH"`
`44`	`45`
`45`		`- test_atexit 'stop_git_daemon'`
	`46`	`+ trap 'code=$?; stop_git_daemon; (exit $code); die' EXIT`
`46`	`47`
`47`	`48`	`say >&3 "Starting git daemon ..."`
`48`	`49`	`mkfifo git_daemon_output`
Original file line number	Diff line number	Diff line change
`@@ -211,4 +211,5 @@ test_expect_success FAKENC 'hostname interpolation works after LF-stripping' '`
`211`	`211`	`test_cmp expect actual`
`212`	`212`	`'`
`213`	`213`
	`214`	`+stop_git_daemon`
`214`	`215`	`test_done`