Merge branch 'master' into debian-jessie-backports

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

diff --git a/t/permalink.t b/t/permalink.t
index edb05a81b1bbdf487aee7b59fff19e6c48fae329..2eb557e1d649c2e5605b76e2285a9dfb2890635e 100755 (executable)
--- a/t/permalink.t
+++ b/t/permalink.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;
 
 my $installed = $ENV{INSTALLED_TESTS};
 use Test::More;
 
 my $installed = $ENV{INSTALLED_TESTS};


@@ -11,10 +12,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));

 }
 
 ok(! system("rm -rf t/tmp"));
 }
 
 ok(! system("rm -rf t/tmp"));