ci-build improvements

This commit contains two improvements to the cleanup done by ci-build on
Windows machines:

1. When a task is killed, also kill its subtasks (taskkill's /t option).

2. Add ocamltest.byte and ocamltest.opt to the list of tasks to kill.
master
Sébastien Hinderer 2018-03-08 16:06:35 +01:00
parent 36fc535792
commit ef96890adb
1 changed files with 2 additions and 2 deletions

View File

@ -50,7 +50,7 @@ arch_error() {
kill_task()
{
task=$1
taskkill /f /im ${task} || true
taskkill /f /im ${task} /t || true
}
quote1 () {
@ -161,7 +161,7 @@ esac
# On Windows, cleanup processes that may remain from previous run
if $cleanup; then
tasks="tee ocamlrun program"
tasks="tee ocamlrun program ocamltest.byte ocamltest.opt"
for task in ${tasks}; do kill_task ${task}.exe; done
fi