diff options
| author |  Lars Schneider <larsxschneider@gmail.com> | 2015-11-19 09:58:09 +0100 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2015-11-20 08:02:06 -0500 |
| commit | 842addef70e41f8bb8a16f4d9084432301c3f50f (patch) | |
| tree | 45762074976add6441a81433d08799d4b4e47713 /t/t3309-notes-merge-auto-resolve.sh | |
| parent | git-p4: retry kill/cleanup operations in tests with timeout (diff) | |
| download | tgif-842addef70e41f8bb8a16f4d9084432301c3f50f.tar.xz | |
git-p4: add p4d timeout in tests
In rare cases p4d seems to hang. This watchdog will kill the p4d
process after 300s in any case. That means each individual git p4 test
needs to finish before 300s or it will fail.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions