Merge branch 'ab/cond-skip-tests' into maint
commite25c1229b2f7f12fd3284297a73bb889c8f35f63
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 20:52:21 +0000 (28 13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 20:52:21 +0000 (28 13:52 -0700)
treebdf831a8872d8f25704b49b196e4b4f713e257af
parentbb622de88df4c013d29f5caaec521ac91ba754fd
parentc6507484a2a87e53a5f0c4c01944192047bbeaa9
Merge branch 'ab/cond-skip-tests' into maint

A few tests were run conditionally under (rare) conditions where
they cannot be run (like running cvs tests under 'root' account).

* ab/cond-skip-tests:
  gitweb tests: skip tests when we don't have Time::HiRes
  gitweb tests: change confusing "skip_all" phrasing
  cvs tests: skip tests that call "cvs commit" when running as root