diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-14 15:23:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-14 15:23:17 -0700 |
| commit | 7c3b2034eda6cda3ef88dc4372da767b76e38bc9 (patch) | |
| tree | 23ad3d7c5b2e3f769a32348182257cfdda8e337f /t/gitweb-lib.sh | |
| parent | d6db3f216544d05e09159756812ccbcb16861d71 (diff) | |
| parent | c6507484a2a87e53a5f0c4c01944192047bbeaa9 (diff) | |
Merge branch 'ab/cond-skip-tests'
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
Diffstat (limited to 't/gitweb-lib.sh')
| -rw-r--r-- | t/gitweb-lib.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh index d5dab5a94f..006d2a8152 100644 --- a/t/gitweb-lib.sh +++ b/t/gitweb-lib.sh @@ -110,7 +110,12 @@ perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 || { } perl -MCGI -MCGI::Util -MCGI::Carp -e 0 >/dev/null 2>&1 || { - skip_all='skipping gitweb tests, CGI module unusable' + skip_all='skipping gitweb tests, CGI & CGI::Util & CGI::Carp modules not available' + test_done +} + +perl -mTime::HiRes -e 0 >/dev/null 2>&1 || { + skip_all='skipping gitweb tests, Time::HiRes module not available' test_done } |