From e92c6722ddd559060514097ac1790c9edc2ee996 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 May 2009 13:27:23 -0400 Subject: stop using perl -T here See bug #411786. Perl's random corruption of the taint flag is even effecting the untainting of source filenames now (which AFAICS, is a proper untaint and always worked before..), and that makes using ikiwiki in perl taint mode not work at all. --- t/basewiki_brokenlinks.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/basewiki_brokenlinks.t') diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t index ac04f800f..479c71a93 100755 --- a/t/basewiki_brokenlinks.t +++ b/t/basewiki_brokenlinks.t @@ -8,7 +8,7 @@ ok(! system("make -s ikiwiki.out")); ok(! system("make extra_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("LC_ALL=C perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ". # always enabled because pages link to it conditionally, # which brokenlinks cannot handle properly "-plugin smiley ". -- cgit v1.2.3 From fd7db49f941eab604fcabdf78b3c36c743005d34 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 May 2009 12:40:40 -0400 Subject: Fix test suite to not rely on an installed copy of ikiwiki after underlaydir change. Closes: #530502 --- debian/changelog | 2 ++ t/basewiki_brokenlinks.t | 1 + 2 files changed, 3 insertions(+) (limited to 't/basewiki_brokenlinks.t') diff --git a/debian/changelog b/debian/changelog index 8088fa705..2be245191 100644 --- 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. + * Fix test suite to not rely on an installed copy of ikiwiki after + underlaydir change. Closes: #530502 -- Joey Hess Fri, 22 May 2009 22:03:12 -0400 diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t index 479c71a93..2871b1dd2 100755 --- 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 ". + "-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)); -- cgit v1.2.3