X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b199349ffddce2b8afd89567882e182f7ef9bff1..0b4981588e6e7e5c49219fa534482f789dc14dad:/t/conflicts.t?ds=sidebyside

diff --git a/t/conflicts.t b/t/conflicts.t
index 07c392cd3..ef183c6b6 100755
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -2,7 +2,8 @@
 # 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};
 
@@ -13,10 +14,10 @@ if ($installed) {
 }
 else {
 	ok(! system("make -s ikiwiki.out"));
-	@command = qw(perl -I. ./ikiwiki.out
+	@command = ("perl", "-I".getcwd, qw(./ikiwiki.out
 		--underlaydir=underlays/basewiki
 		--set underlaydirbase=underlays
-		--templatedir=templates);
+		--templatedir=templates));
 }
 
 # setup
@@ -142,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");
 
-# cleanup
-ok(! system("rm -rf t/tmp"));
+done_testing;