Merge branch 'master' into debian-jessie-backports

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

diff --git a/t/trail.t b/t/trail.t
index cac64c36628c3bd75147e0e1ccb8d9aa74a5d3fc..ed180d35cd9820537afead9df25c00696a5cc83f 100755 (executable)
--- a/t/trail.t
+++ b/t/trail.t
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

+use Cwd qw(getcwd);

 use Test::More;
 use IkiWiki;
 
 use Test::More;
 use IkiWiki;
 


@@ -35,10 +36,10 @@ if ($installed) {
 }
 else {
        ok(! system("make -s ikiwiki.out"));
 }
 else {
        ok(! system("make -s ikiwiki.out"));

-       @command = qw(perl -I. ./ikiwiki.out
+       @command = ("perl", "-I".getcwd, qw(./ikiwiki.out

                --underlaydir=underlays/basewiki
                --set underlaydirbase=underlays
                --underlaydir=underlays/basewiki
                --set underlaydirbase=underlays

-               --templatedir=templates);
+               --templatedir=templates));

 }
 
 push @command, qw(--set usedirs=0 --plugin trail --plugin inline
 }
 
 push @command, qw(--set usedirs=0 --plugin trail --plugin inline