Skip to content

Commit 7d37ed1

Browse files
committed
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
2 parents ebae81e + 880ef58 commit 7d37ed1

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

t/t0090-cache-tree.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ test_expect_success 'second commit has cache-tree' '
131131
test_cache_tree
132132
'
133133

134-
test_expect_success 'commit --interactive gives cache-tree on partial commit' '
134+
test_expect_success PERL 'commit --interactive gives cache-tree on partial commit' '
135135
cat <<-\EOT >foo.c &&
136136
int foo()
137137
{

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)