diff options
| author |  Lars Schneider <larsxschneider@gmail.com> | 2015-11-19 09:58:10 +0100 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2015-11-20 08:02:06 -0500 |
| commit | dfe90e8b528be4d9668b1bdc6329f8227cbf307a (patch) | |
| tree | 988c31df81e859f216302cca2c0e7d401e042cff /ll-merge.h | |
| parent | git-p4: add p4d timeout in tests (diff) | |
| download | tgif-dfe90e8b528be4d9668b1bdc6329f8227cbf307a.tar.xz | |
git-p4: add trap to kill p4d on test exit
Sometimes the "prove" test runner hangs on test exit because p4d is
still running. Add a trap to always kill "p4d" on test exit.
You can reproduce the problem by commenting "P4D_TIMEOUT" in
"lib-git-p4.sh" and running "prove ./t9800-git-p4-basic.sh".
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions