Merge branch 'master' into debian-jessie-backports

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

diff --git a/t/permalink.t b/t/permalink.t
index 13a72fc5625fa25cd0b7a7624948fadd26ab9f09..2eb557e1d649c2e5605b76e2285a9dfb2890635e 100755 (executable)
--- a/t/permalink.t
+++ b/t/permalink.t
@@ -1,14 +1,32 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

-use Test::More 'no_plan';
+use Cwd qw(getcwd);
+use Test::More;
+
+my $installed = $ENV{INSTALLED_TESTS};
+
+my @command;
+if ($installed) {
+       @command = qw(ikiwiki);
+}
+else {
+       ok(! system("make -s ikiwiki.out"));
+       @command = ("perl", "-I".getcwd, qw(./ikiwiki.out
+               --underlaydir=underlays/basewiki
+               --set underlaydirbase=underlays
+               --templatedir=templates));
+}

 
 ok(! system("rm -rf t/tmp"));
 ok(! system("mkdir t/tmp"));
 
 ok(! system("rm -rf t/tmp"));
 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 --set underlaydirbase=underlays --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/";
 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"));
 # This guid should never, ever change, for any reason whatsoever!
 my $guid="http://example.com/post/";
 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"));

+
+done_testing();