From: Jeff King <peff@peff.net>
Date: Tue, 1 Dec 2015 23:54:40 +0000 (-0500)
Subject: Merge branch 'ls/p4-test-timeouts'
X-Git-Tag: v2.7.0-rc0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa7095e63d0a9ace33114ebb2736084230e69b7a;p=thirdparty%2Fgit.git

Merge branch 'ls/p4-test-timeouts'

Work around some test flakiness with p4d.

* ls/p4-test-timeouts:
  git-p4: add trap to kill p4d on test exit
  git-p4: add p4d timeout in tests
  git-p4: retry kill/cleanup operations in tests with timeout
---

fa7095e63d0a9ace33114ebb2736084230e69b7a