Merge branch 'master' of git://git.ikiwiki.info

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

diff --git a/t/permalink.t b/t/permalink.t
index b49b9833813468597e269ab0b9af38ae9920dc0b..81d4d18206e860f672f7689222ef45c526dcc0a5 100755 (executable)
--- a/t/permalink.t
+++ b/t/permalink.t
@@ -5,9 +5,9 @@ use Test::More 'no_plan';
 
 ok(! system("mkdir t/tmp"));
 ok(! system("make -s ikiwiki.out"));
 
 ok(! system("mkdir t/tmp"));
 ok(! system("make -s ikiwiki.out"));

-ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -templatedir=templates t/tinyblog t/tmp/out"));
+ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates t/tinyblog t/tmp/out"));

 # This guid should never, ever change, for any reason whatsoever!
 my $guid="http://example.com/post/";
 # This guid should never, ever change, for any reason whatsoever!
 my $guid="http://example.com/post/";

-ok(length `grep '<guid>$guid</guid>' t/tmp/out/index.rss`);
-ok(length `grep '<id>$guid</id>' t/tmp/out/index.atom`);
+ok(length `egrep '<guid.*>$guid</guid>' t/tmp/out/index.rss`);
+ok(length `egrep '<id>$guid</id>' t/tmp/out/index.atom`);

 ok(! system("rm -rf t/tmp t/tinyblog/.ikiwiki"));
 ok(! system("rm -rf t/tmp t/tinyblog/.ikiwiki"));