Skip to content

Commit 880ef58

Browse files
peffgitster
authored andcommitted
t960[34]: mark cvsimport tests as requiring perl
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5a97639 commit 880ef58

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

t/t9603-cvsimport-patchsets.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test_description='git cvsimport testing for correct patchset estimation'
1616

1717
setup_cvs_test_repository t9603
1818

19-
test_expect_failure 'import with criss cross times on revisions' '
19+
test_expect_failure PERL 'import with criss cross times on revisions' '
2020
2121
git cvsimport -p"-x" -C module-git module &&
2222
(cd module-git &&

t/t9604-cvsimport-timestamps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ test_description='git cvsimport timestamps'
55

66
setup_cvs_test_repository t9604
77

8-
test_expect_success 'check timestamps are UTC (TZ=CST6CDT)' '
8+
test_expect_success PERL 'check timestamps are UTC (TZ=CST6CDT)' '
99
1010
TZ=CST6CDT git cvsimport -p"-x" -C module-1 module &&
1111
git cvsimport -p"-x" -C module-1 module &&
@@ -34,7 +34,7 @@ test_expect_success 'check timestamps are UTC (TZ=CST6CDT)' '
3434
test_cmp actual-1 expect-1
3535
'
3636

37-
test_expect_success 'check timestamps with author-specific timezones' '
37+
test_expect_success PERL 'check timestamps with author-specific timezones' '
3838
3939
cat >cvs-authors <<-EOF &&
4040
user1=User One <[email protected]>

0 commit comments

Comments
 (0)