Remove spurious changelog entry

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

diff --git a/t/permalink.t b/t/permalink.t
index c326e8d278e4f025a8623512ab06d57a6ad5565c..edb05a81b1bbdf487aee7b59fff19e6c48fae329 100755 (executable)
--- a/t/permalink.t
+++ b/t/permalink.t
@@ -1,13 +1,31 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

-use Test::More 'no_plan';
+use Test::More;

 
 

+my $installed = $ENV{INSTALLED_TESTS};
+
+my @command;
+if ($installed) {
+       @command = qw(ikiwiki);
+}
+else {
+       ok(! system("make -s ikiwiki.out"));
+       @command = qw(perl -I. ./ikiwiki.out
+               --underlaydir=underlays/basewiki
+               --set underlaydirbase=underlays
+               --templatedir=templates);
+}
+
+ok(! system("rm -rf t/tmp"));

 ok(! system("mkdir t/tmp"));
 ok(! system("mkdir t/tmp"));

-ok(! system("make -s ikiwiki.out"));
-ok(! system("LC_ALL=C 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(@command, qw(--plugin inline --url=http://example.com
+               --cgiurl=http://example.com/ikiwiki.cgi --rss --atom
+               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"));

+
+done_testing();