Browse Source

Merge branch 'jk/no-perl-tests'

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
maint
Junio C Hamano 10 years ago
parent
commit
f54629e7b6
  1. 2
      t/t0090-cache-tree.sh
  2. 2
      t/t9603-cvsimport-patchsets.sh
  3. 4
      t/t9604-cvsimport-timestamps.sh

2
t/t0090-cache-tree.sh

@ -131,7 +131,7 @@ test_expect_success 'second commit has cache-tree' ' @@ -131,7 +131,7 @@ test_expect_success 'second commit has 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 &&
int foo()
{

2
t/t9603-cvsimport-patchsets.sh

@ -16,7 +16,7 @@ test_description='git cvsimport testing for correct patchset estimation' @@ -16,7 +16,7 @@ test_description='git cvsimport testing for correct patchset estimation'

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 &&
(cd module-git &&

4
t/t9604-cvsimport-timestamps.sh

@ -5,7 +5,7 @@ test_description='git cvsimport timestamps' @@ -5,7 +5,7 @@ test_description='git cvsimport timestamps'

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 &&
git cvsimport -p"-x" -C module-1 module &&
@ -34,7 +34,7 @@ test_expect_success 'check timestamps are UTC (TZ=CST6CDT)' ' @@ -34,7 +34,7 @@ test_expect_success 'check timestamps are UTC (TZ=CST6CDT)' '
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 &&
user1=User One <user1@domain.org>

Loading…
Cancel
Save