diff options
| author | Jeff King <peff@peff.net> | 2014-11-18 12:29:32 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-18 10:16:09 -0800 |
| commit | 880ef58b3d0e522bd3cfe49fc4b41b0a0ed33164 (patch) | |
| tree | e808ca7380c32500045e9e92706ce96fd20b08d3 | |
| parent | 5a97639b396a007a226308b6eceae5efb71c7500 (diff) | |
| download | git-880ef58b3d0e522bd3cfe49fc4b41b0a0ed33164.tar.gz git-880ef58b3d0e522bd3cfe49fc4b41b0a0ed33164.tar.xz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9603-cvsimport-patchsets.sh | 2 | ||||
| -rwxr-xr-x | t/t9604-cvsimport-timestamps.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh index 52034c8f7..c4c3c4954 100755 --- a/t/t9603-cvsimport-patchsets.sh +++ b/t/t9603-cvsimport-patchsets.sh @@ -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 && diff --git a/t/t9604-cvsimport-timestamps.sh b/t/t9604-cvsimport-timestamps.sh index 1fd51423e..a4b3db24b 100755 --- a/t/t9604-cvsimport-timestamps.sh +++ b/t/t9604-cvsimport-timestamps.sh @@ -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)' ' 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> |