Merge branch 'master' into cvs

[ikiwiki.git] / t / basewiki_brokenlinks.t

diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index ac04f800fa2a633e0706240217e14ffa4ab3161b..d74f64e362f6e0822ec953e2eda2ce95c05764ea 100755 (executable)
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -5,15 +5,16 @@ use Test::More 'no_plan';
 
 ok(! system("rm -rf t/tmp; mkdir t/tmp"));
 ok(! system("make -s ikiwiki.out"));
-ok(! system("make extra_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null"));
+ok(! system("make underlay_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null"));
 
 foreach my $plugin ("", "listdirectives") {
-       ok(! system("LC_ALL=C perl -T -I. ./ikiwiki.out -rebuild -plugin brokenlinks ".
+       ok(! system("perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ".
                        # always enabled because pages link to it conditionally,
                        # which brokenlinks cannot handle properly
                        "-plugin smiley ".
                        ($plugin ? "-plugin $plugin " : "").
                        "-underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki ".
+                       "-set underlaydirbase=t/tmp/install/usr/share/ikiwiki ".
                        "-templatedir=templates t/basewiki_brokenlinks t/tmp/out"));
        my $result=`grep 'no broken links' t/tmp/out/index.html`;
        ok(length($result));