diff options
author | Simon McVittie <smcv@debian.org> | 2015-11-30 17:33:00 +0000 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2015-11-30 18:26:22 +0000 |
commit | cdfb4ab1a3c60bf699b8d77618ec9bdf526cdb35 (patch) | |
tree | 6a33fd51436d66178fdfab689a8c6076cefa1c54 /t/conflicts.t | |
parent | 78a47d44c7c7d798c0a16c17954caef57e4c192e (diff) | |
download | ikiwiki-cdfb4ab1a3c60bf699b8d77618ec9bdf526cdb35.tar ikiwiki-cdfb4ab1a3c60bf699b8d77618ec9bdf526cdb35.tar.gz |
Run autopkgtest tests using autodep8 and the pkg-perl team's infrastructure
Diffstat (limited to 't/conflicts.t')
-rwxr-xr-x | t/conflicts.t | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/t/conflicts.t b/t/conflicts.t index fae0e84c9..07c392cd3 100755 --- a/t/conflicts.t +++ b/t/conflicts.t @@ -4,15 +4,30 @@ use warnings; 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"; -ok(! system("make -s ikiwiki.out")); # 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 { |