(no commit message)

[git.ikiwiki.info.git] / t / cvs.t

diff --git a/t/cvs.t b/t/cvs.t
index 17598f7f72f82ac14a19a3d10cae1996889d37db..6acafd701fe39f29ea3732983784439c929eefad 100755 (executable)
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -1,9 +1,11 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

-use Test::More; my $total_tests = 71;
+use Test::More; my $total_tests = 72;

 use IkiWiki;
 
 use IkiWiki;
 

+my $installed = $ENV{INSTALLED_TESTS};
+

 my $default_test_methods = '^test_*';
 my @required_programs = qw(
        cvs
 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;
        $config{wrapper} = $config{cvs_wrapper};
 
        require IkiWiki::Wrapper;

-       {
-               no warnings 'once';
-               $IkiWiki::program_to_wrap = 'ikiwiki.out';
-               # XXX substitute its interpreter to Makefile's $(PERL)
-               # XXX best solution: do this to all scripts during build
+       if ($installed) {
+               $IkiWiki::program_to_wrap = `which ikiwiki`;
+       }
+       else {
+               $IkiWiki::program_to_wrap = './ikiwiki.out';

        }
        }

+       # 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}";
        IkiWiki::gen_wrapper();
 
        my $cvs = "cvs -d $config{cvsrepo}";


@@ -704,5 +708,5 @@ sub stripext {
 }
 
 sub _wrapper_paths {
 }
 
 sub _wrapper_paths {

-       return qq{newenviron[i++]="PERL5LIB=$ENV{PERL5LIB}";};
+       return qq{addenv("PERL5LIB", "$ENV{PERL5LIB}");};

 }
 }