Skip to content

Commit

Permalink
t960[34]: mark cvsimport tests as requiring perl
Browse files Browse the repository at this point in the history
Git-cvsimport is written in perl, which understandably
causes the tests to fail if you build with NO_PERL (which
will avoid building cvsimport at all). The earlier cvsimport
tests in t9600-t9602 are all marked with a PERL
prerequisite, but these ones are not.

The one in t9603 was likely not noticed because it is an
expected failure anyway.

The ones in t9604 have been around for a long time, but it
is likely that the combination of NO_PERL and having cvsps
installed is rare enough that nobody noticed.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Nov 18, 2014
1 parent 5a97639 commit 880ef58
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion t/t9603-cvsimport-patchsets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
4 changes: 2 additions & 2 deletions t/t9604-cvsimport-timestamps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 880ef58

Please sign in to comment.