Merge branch 'jk/no-perl-tests' into maint

Some tests that depend on perl lacked PERL prerequisite to protect
them, breaking build with NO_PERL configuration.

* jk/no-perl-tests:
  t960[34]: mark cvsimport tests as requiring perl
  t0090: mark add-interactive test with PERL prerequisite
This commit is contained in:
Junio C Hamano 2014-12-22 12:18:25 -08:00
Родитель ebae81e96d 880ef58b3d
Коммит 7d37ed1382
3 изменённых файлов: 4 добавлений и 4 удалений

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

@ -131,7 +131,7 @@ test_expect_success 'second commit has cache-tree' '
test_cache_tree test_cache_tree
' '
test_expect_success 'commit --interactive gives cache-tree on partial commit' ' test_expect_success PERL 'commit --interactive gives cache-tree on partial commit' '
cat <<-\EOT >foo.c && cat <<-\EOT >foo.c &&
int foo() int foo()
{ {

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

@ -16,7 +16,7 @@ test_description='git cvsimport testing for correct patchset estimation'
setup_cvs_test_repository t9603 setup_cvs_test_repository t9603
test_expect_failure 'import with criss cross times on revisions' ' test_expect_failure PERL 'import with criss cross times on revisions' '
git cvsimport -p"-x" -C module-git module && git cvsimport -p"-x" -C module-git module &&
(cd module-git && (cd module-git &&

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

@ -5,7 +5,7 @@ test_description='git cvsimport timestamps'
setup_cvs_test_repository t9604 setup_cvs_test_repository t9604
test_expect_success 'check timestamps are UTC (TZ=CST6CDT)' ' test_expect_success PERL 'check timestamps are UTC (TZ=CST6CDT)' '
TZ=CST6CDT git cvsimport -p"-x" -C module-1 module && TZ=CST6CDT git cvsimport -p"-x" -C module-1 module &&
git cvsimport -p"-x" -C module-1 module && git cvsimport -p"-x" -C module-1 module &&
@ -34,7 +34,7 @@ test_expect_success 'check timestamps are UTC (TZ=CST6CDT)' '
test_cmp actual-1 expect-1 test_cmp actual-1 expect-1
' '
test_expect_success 'check timestamps with author-specific timezones' ' test_expect_success PERL 'check timestamps with author-specific timezones' '
cat >cvs-authors <<-EOF && cat >cvs-authors <<-EOF &&
user1=User One <user1@domain.org> user1=User One <user1@domain.org>