diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2019-07-05 04:26:24 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2019-07-05 04:26:24 +0200 |
| commit | 590bf57446967d897ee8327c8b2df57b77f4744e (patch) | |
| tree | 877ba9054b883045592de277911b407522598e77 /tests/00-db-exclusive | |
| parent | 272ab84e5cb4f37f5fb0351b934839a45b8dd72d (diff) | |
| parent | 25f1dbdf54947bd6bbce653bc64f6c45b2473792 (diff) | |
Merge branch 'master' into debian
Diffstat (limited to 'tests/00-db-exclusive')
| -rw-r--r-- | tests/00-db-exclusive/run | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/00-db-exclusive/run b/tests/00-db-exclusive/run index 1ae27b6..1528b3b 100644 --- a/tests/00-db-exclusive/run +++ b/tests/00-db-exclusive/run @@ -9,8 +9,8 @@ interimap interimap --watch=60 & pid=$! cleanup() { # kill interimap process and its children - pkill -P "$pid" -TERM - kill -TERM "$pid" + pkill -P "$pid" -TERM || true + kill -TERM "$pid" || true wait } trap cleanup EXIT INT TERM |