diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-12 14:31:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-12 14:31:36 -0800 |
| commit | f54629e7b6472b2afae9946b9027cd3e7ee23126 (patch) | |
| tree | 1544fc5f7cf25b93666927c41444bb059b00aebc /t/t9604-cvsimport-timestamps.sh | |
| parent | Merge branch 'sv/typofix-apply-error-message' (diff) | |
| parent | t960[34]: mark cvsimport tests as requiring perl (diff) | |
| download | tgif-f54629e7b6472b2afae9946b9027cd3e7ee23126.tar.xz | |
Merge branch 'jk/no-perl-tests'
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
Diffstat (limited to 't/t9604-cvsimport-timestamps.sh')
| -rwxr-xr-x | t/t9604-cvsimport-timestamps.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9604-cvsimport-timestamps.sh b/t/t9604-cvsimport-timestamps.sh index 1fd51423ee..a4b3db24bd 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> |