Merge branch 'master' into autoconfig

master
Joey Hess 2008-07-25 19:41:20 -04:00
commit b74b7ab68b
4 changed files with 16 additions and 1 deletions

View File

@ -4,7 +4,7 @@ use strict;
use Test::More 'no_plan'; use Test::More 'no_plan';
ok(! system("mkdir t/tmp")); ok(! system("mkdir t/tmp"));
ok(! system("make -q ikiwiki.out")); ok(! system("make -s ikiwiki.out"));
ok(! system("make extra_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null")); ok(! system("make extra_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null"));
ok(! system("LC_ALL=C perl -T -I. ./ikiwiki.out -plugin smiley -plugin brokenlinks -rebuild -underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki -templatedir=templates t/basewiki_brokenlinks t/tmp/out")); ok(! system("LC_ALL=C perl -T -I. ./ikiwiki.out -plugin smiley -plugin brokenlinks -rebuild -underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki -templatedir=templates t/basewiki_brokenlinks t/tmp/out"));
ok(`grep 'no broken links' t/tmp/out/index.html`); ok(`grep 'no broken links' t/tmp/out/index.html`);

13
t/permalink.t 100755
View File

@ -0,0 +1,13 @@
#!/usr/bin/perl
use warnings;
use strict;
use Test::More 'no_plan';
ok(! system("mkdir t/tmp"));
ok(! system("make -s ikiwiki.out"));
ok(! system("LC_ALL=C perl -T -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"));
# 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(! system("rm -rf t/tmp t/tinyblog/.ikiwiki"));

View File

@ -0,0 +1 @@
[[inline pages="post" rss=yes]]

View File

@ -0,0 +1 @@
only post