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
This commit is contained in:
Junio C Hamano 2017-03-28 13:52:21 -07:00
Родитель bb622de88d c6507484a2
Коммит e25c1229b2
3 изменённых файлов: 16 добавлений и 1 удалений

Просмотреть файл

@ -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
}

Просмотреть файл

@ -18,6 +18,11 @@ then
test_done
fi
if ! test_have_prereq NOT_ROOT; then
skip_all='When cvs is compiled with CVS_BADROOT commits as root fail'
test_done
fi
CVSROOT=$PWD/tmpcvsroot
CVSWORK=$PWD/cvswork
GIT_DIR=$PWD/.git

Просмотреть файл

@ -3,6 +3,11 @@
test_description='git cvsimport basic tests'
. ./lib-cvs.sh
if ! test_have_prereq NOT_ROOT; then
skip_all='When cvs is compiled with CVS_BADROOT commits as root fail'
test_done
fi
test_expect_success PERL 'setup cvsroot environment' '
CVSROOT=$(pwd)/cvsroot &&
export CVSROOT