diff options
Diffstat (limited to 'tests/integration/run.sh')
| -rwxr-xr-x | tests/integration/run.sh | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tests/integration/run.sh b/tests/integration/run.sh index ce3ebd25e..832032ba3 100755 --- a/tests/integration/run.sh +++ b/tests/integration/run.sh @@ -17,16 +17,25 @@ echo '#' echo '# Starting PHP webserver' echo '#' php -S localhost:8080 -t ${ROOT_DIR} & -PHPPID=$! +PHPPID1=$! echo 'Running on process ID:' -echo $PHPPID +echo $PHPPID1 # also kill php process in case of ctrl+c -trap 'kill -TERM $PHPPID; wait $PHPPID' TERM +trap 'kill -TERM $PHPPID1; wait $PHPPID1' TERM # The federated server is started and stopped by the tests themselves PORT_FED=8180 export PORT_FED + +php -S localhost:${PORT_FED} -t ${ROOT_DIR} & +PHPPID2=$! +echo 'Running on process ID:' +echo $PHPPID2 + +# also kill php process in case of ctrl+c +trap 'kill -TERM $PHPPID2; wait $PHPPID2' TERM + NEXTCLOUD_ROOT_DIR=${ROOT_DIR} export NEXTCLOUD_ROOT_DIR export TEST_SERVER_URL="http://localhost:8080/" @@ -74,11 +83,13 @@ echo '' echo '#' echo '# Stopping PHP webserver and disabling spreedcheats' echo '#' -kill $PHPPID +kill $PHPPID1 +kill $PHPPID2 ${ROOT_DIR}/occ app:disable spreedcheats rm -rf ../../../spreedcheats -wait $PHPPID +wait $PHPPID1 +wait $PHPPID2 exit $RESULT |