Merge pull request #4759 from nextcloud/enh/noid/test-server-ctrlc/st…

…able20.1 [stable20.1] Abort php test server on ctrl+c
nextcloud · Dec 14, 2020 · 5d6cf06 · 5d6cf06
2 parents c2c576a + beeb36d
commit 5d6cf06
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tests/integration/run.sh b/tests/integration/run.sh
@@ -10,6 +10,9 @@ php -S localhost:8080 -t ${ROOT_DIR} &
 PHPPID=$!
 echo $PHPPID
 
+# also kill php process in case of ctrl+c
+trap 'kill -TERM $PHPPID; wait $PHPPID' TERM
+
 cp -R ./spreedcheats ../../../spreedcheats
 ${ROOT_DIR}/occ app:enable spreed || exit 1
 ${ROOT_DIR}/occ app:enable spreedcheats || exit 1
@@ -24,4 +27,6 @@ kill $PHPPID
 ${ROOT_DIR}/occ app:disable spreedcheats
 rm -rf ../../../spreedcheats
 
+wait $PHPPID
+
 exit $RESULT