Rebuild for jessie-backports.

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

diff --git a/t/conflicts.t b/t/conflicts.t
index fae0e84c9afda1365b14106313640e8e9aa5f889..07c392cd3a70ae59992f422124814cd21fdd5b32 100755 (executable)
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -4,15 +4,30 @@ use warnings;
 use strict;
 use Test::More tests => 106;
 
 use strict;
 use Test::More tests => 106;
 

+my $installed = $ENV{INSTALLED_TESTS};
+
+my @command;
+if ($installed) {
+       ok(1, "running 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);
+}
+

 # setup
 my $srcdir="t/tmp/src";
 my $destdir="t/tmp/dest";
 # setup
 my $srcdir="t/tmp/src";
 my $destdir="t/tmp/dest";

-ok(! system("make -s ikiwiki.out"));

 
 # runs ikiwiki to build test site
 sub runiki {
        my $testdesc=shift;
 
 # runs ikiwiki to build test site
 sub runiki {
        my $testdesc=shift;

-       ok((! system("perl -I. ./ikiwiki.out --plugin txt --plugin rawhtml --underlaydir=underlays/basewiki --set underlaydirbase=underlays --templatedir=templates $srcdir $destdir @_")),
+       ok((! system(@command, qw(--plugin txt --plugin rawhtml),
+                               $srcdir, $destdir, @_)),

                $testdesc);
 }
 sub refreshiki {
                $testdesc);
 }
 sub refreshiki {