Fix test suite to not rely on an installed copy of ikiwiki after underlaydir change...

diff --git a/debian/changelog b/debian/changelog
index 8088fa705245273fa82dbb1db17ad097476de1ae..2be245191551a62ac6a1e1552d4cd1aa65493270 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.14) UNRELEASED; urgency=low
   * format: Provide a htmlizefallback hook that other plugins
     can use to handle formats that are not suitable for general-purpose
     htmlize hooks. Used by highlight.
   * format: Provide a htmlizefallback hook that other plugins
     can use to handle formats that are not suitable for general-purpose
     htmlize hooks. Used by highlight.

+  * Fix test suite to not rely on an installed copy of ikiwiki after
+    underlaydir change. Closes: #530502

 
  -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 22:03:12 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 22:03:12 -0400
 

diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index 479c71a93a0bcbe94e8b0bd867668c6484f8c134..2871b1dd20524836df0451b3e335a022d25f1724 100755 (executable)
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -14,6 +14,7 @@ foreach my $plugin ("", "listdirectives") {
                        "-plugin smiley ".
                        ($plugin ? "-plugin $plugin " : "").
                        "-underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki ".
                        "-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));
                        "-templatedir=templates t/basewiki_brokenlinks t/tmp/out"));
        my $result=`grep 'no broken links' t/tmp/out/index.html`;
        ok(length($result));