a clean-up plugin, to keep dest dir synced only to ikiwiki generates files

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

diff --git a/t/conflicts.t b/t/conflicts.t
index d7e04d3ae39a66b1bdcd711aa0aa0ee12f0584ec..ef183c6b6854939a32818c3fd9f655d7211ed64f 100755 (executable)
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -2,17 +2,33 @@
 # Tests for bugs relating to conflicting files in the srcdir
 use warnings;
 use strict;
 # Tests for bugs relating to conflicting files in the srcdir
 use warnings;
 use strict;

-use Test::More tests => 106;
+use Cwd qw(getcwd);
+use Test::More;
+
+my $installed = $ENV{INSTALLED_TESTS};
+
+my @command;
+if ($installed) {
+       ok(1, "running 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));
+}

 
 # 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 {


@@ -127,5 +143,4 @@ ok(! system("mkdir -p $srcdir/foo"));
 ok(! system("touch $srcdir/foo/index.html"));
 setupiki("rawhtml file rendered same as existing page in setup");
 
 ok(! system("touch $srcdir/foo/index.html"));
 setupiki("rawhtml file rendered same as existing page in setup");
 

-# cleanup
-ok(! system("rm -rf t/tmp"));
+done_testing;