| commit | f89f35a9d41535b3e8ebe500489634e623ae8d83 | |
| author | Pete Wyckoff <pw@padd.com> | |
| Thu, 28 Jun 2012 02:48:07 +0000 (27 22:48 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Jun 2012 04:06:12 +0000 (27 21:06 -0700) | ||
| tree | 2af0308fb2501c07107e733fca7a610442523764 | treesnapshot (tar.gz zip) |
| parent | 4c8a9db6f7dd9e10b5ce9bfbcd5faa82a8c86ce3 | commitdiff |
git p4 test: wait longer for p4d to start and test its pid
Running tests at high parallelism on a slow machine, 5 sec is
not enough to wait for p4d to start. Change it to 5 minutes,
adding an environment variable P4D_START_PATIENCE to shrink
that if needed in automated test environments.
Also check if the pid of the p4d that we started is still
around. If not, quit waiting for it immediately.
Remove all the confusing && chaining and simplify the code.
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Running tests at high parallelism on a slow machine, 5 sec is
not enough to wait for p4d to start. Change it to 5 minutes,
adding an environment variable P4D_START_PATIENCE to shrink
that if needed in automated test environments.
Also check if the pid of the p4d that we started is still
around. If not, quit waiting for it immediately.
Remove all the confusing && chaining and simplify the code.
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/lib-git-p4.sh | diffblobblamehistory |