Commit Diff

Commit:
cc66d7541018b667f159ed509c2d63885e2432e2
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas.adam22@gmail.com>
Date:
Message:
attempt to kill http-server when tests exit abnormally
Actions:
Patch | Tree
commit - 66f0e755b3853ac752edb570869940668da7f4b6
commit + cc66d7541018b667f159ed509c2d63885e2432e2
blob - eec407df5b695539c76de24f3f2392b433fbf1a3
blob + 95b0e4aeb0e81d800561f45b18ef2f2c3e1b60b9
--- regress/cmdline/clone.sh
+++ regress/cmdline/clone.sh
@@ -869,6 +869,7 @@ test_clone_basic_http() {
 
 	timeout 5 ./http-server -p $GOT_TEST_HTTP_PORT $testroot \
 	    > $testroot/http-server.log &
+	trap "kill %1" HUP INT QUIT PIPE TERM
 
 	sleep 1 # server starts up
 
blob - ee1e5cec9976e01bbd4fe71d2375f8f2d4320139
blob + 928c5f4563e3de646b74ef37ef6fd2588857395d
--- regress/cmdline/fetch.sh
+++ regress/cmdline/fetch.sh
@@ -2027,6 +2027,7 @@ test_fetch_basic_http() {
 
 	timeout 5 ./http-server -p $GOT_TEST_HTTP_PORT $testroot \
 	    > $testroot/http-server.log &
+	trap "kill %1" HUP INT QUIT PIPE TERM
 
 	sleep 1 # server starts up
 
blob - e790e19cb5dfcd481bdc20e2f0f2afd698bcccee
blob + 6e41801df46b386834c2cd1d3bc4d5c039d5f809
--- regress/cmdline/send.sh
+++ regress/cmdline/send.sh
@@ -1672,6 +1672,7 @@ test_send_basic_http() {
 
 	timeout 5 ./http-server -p $GOT_TEST_HTTP_PORT $testroot \
 	    > $testroot/http-server.log &
+	trap "kill %1" HUP INT QUIT PIPE TERM
 
 	sleep 1 # server starts up