ensure that cleanup() runs if terminated by the user

rhansen · rhansen · commit 17914a357295 · 2016-01-31T16:12:58.000-05:00
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
@@ -59,6 +59,7 @@ cleanup() {
 }
 [ -z "${BUILD_TEST_ENV_AUTO_CLEANUP+set}" ] || {
     trap cleanup EXIT
+    trap 'exit 1' HUP INT TERM
 }
 
 docker run --name gitlab-test --detach --publish 8080:80 \

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ cleanup() {`
`59`	`59`	`}`
`60`	`60`	`[ -z "${BUILD_TEST_ENV_AUTO_CLEANUP+set}" ] \|\| {`
`61`	`61`	`trap cleanup EXIT`
	`62`	`+ trap 'exit 1' HUP INT TERM`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`docker run --name gitlab-test --detach --publish 8080:80 \`