Merge branch 'master' into autoconfig

4 files changed, 16 insertions, 1 deletions

diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index 994e3e377..9753122a0 100755
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -4,7 +4,7 @@ use strict;
 use Test::More 'no_plan';
 
 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("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`);
diff --git a/t/permalink.t b/t/permalink.t
new file mode 100755
index 000000000..9b44cd72e
--- /dev/null
+++ b/t/permalink.t
@@ -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"));
diff --git a/t/tinyblog/index.mdwn b/t/tinyblog/index.mdwn
new file mode 100644
index 000000000..010c85de1
--- /dev/null
+++ b/t/tinyblog/index.mdwn
@@ -0,0 +1 @@
+[[inline pages="post" rss=yes]]
diff --git a/t/tinyblog/post.mdwn b/t/tinyblog/post.mdwn
new file mode 100644
index 000000000..9eaeec7ef
--- /dev/null
+++ b/t/tinyblog/post.mdwn
@@ -0,0 +1 @@
+only post