Skip to content

Commit

Permalink
Merge branch 'jk/no-perl-tests' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Dec 22, 2014
2 parents ebae81e + 880ef58 commit 7d37ed1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion t/t0090-cache-tree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
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 7d37ed1

Please sign in to comment.