X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/78a47d44c7c7d798c0a16c17954caef57e4c192e..cdfb4ab1a3c60bf699b8d77618ec9bdf526cdb35:/t/cvs.t diff --git a/t/cvs.t b/t/cvs.t index cbac43252..43a2ca3a8 100755 --- a/t/cvs.t +++ b/t/cvs.t @@ -4,6 +4,8 @@ use strict; use Test::More; my $total_tests = 72; use IkiWiki; +my $installed = $ENV{INSTALLED_TESTS}; + my $default_test_methods = '^test_*'; my @required_programs = qw( cvs @@ -606,12 +608,14 @@ sub _generate_and_configure_post_commit_hook { $config{wrapper} = $config{cvs_wrapper}; require IkiWiki::Wrapper; - { - no warnings 'once'; + if ($installed) { $IkiWiki::program_to_wrap = 'ikiwiki.out'; - # XXX substitute its interpreter to Makefile's $(PERL) - # XXX best solution: do this to all scripts during build } + else { + $IkiWiki::program_to_wrap = `which ikiwiki`; + } + # XXX substitute its interpreter to Makefile's $(PERL) + # XXX best solution: do this to all scripts during build IkiWiki::gen_wrapper(); my $cvs = "cvs -d $config{cvsrepo}";