From cdfb4ab1a3c60bf699b8d77618ec9bdf526cdb35 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 30 Nov 2015 17:33:00 +0000 Subject: Run autopkgtest tests using autodep8 and the pkg-perl team's infrastructure --- t/podcast.t | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 't/podcast.t') diff --git a/t/podcast.t b/t/podcast.t index ef90b5205..c698d1835 100755 --- a/t/podcast.t +++ b/t/podcast.t @@ -9,13 +9,28 @@ BEGIN { "XML::Feed and/or HTML::Parser or File::MimeInfo not available"}; } else { - eval q{use Test::More tests => 136}; + eval q{use Test::More tests => 137}; } } use Cwd; use File::Basename; +my $installed = $ENV{INSTALLED_TESTS}; + +my @base_command; +if ($installed) { + ok(1, "running installed"); + @base_command = qw(ikiwiki); +} +else { + ok(! system("make -s ikiwiki.out")); + @base_command = qw(perl -I. ./ikiwiki.out + --underlaydir=underlays/basewiki + --set underlaydirbase=underlays + --templatedir=templates); +} + my $tmp = 't/tmp'; my $statedir = 't/tinypodcast/.ikiwiki'; @@ -23,9 +38,7 @@ sub podcast { my $podcast_style = shift; my $baseurl = 'http://example.com'; - my @command = (qw(./ikiwiki.out --plugin inline --rss --atom)); - push @command, qw(-underlaydir=underlays/basewiki); - push @command, qw(-set underlaydirbase=underlays --templatedir=templates); + my @command = (@base_command, qw(--plugin inline --rss --atom)); push @command, "--url=$baseurl", qw(t/tinypodcast), "$tmp/out"; ok(! system("mkdir $tmp"), @@ -113,9 +126,7 @@ sub podcast { } sub single_page_html { - my @command = (qw(./ikiwiki.out)); - push @command, qw(-underlaydir=underlays/basewiki); - push @command, qw(-set underlaydirbase=underlays --templatedir=templates); + my @command = @base_command; push @command, qw(t/tinypodcast), "$tmp/out"; ok(! system("mkdir $tmp"), @@ -158,9 +169,7 @@ sub single_page_html { } sub inlined_pages_html { - my @command = (qw(./ikiwiki.out --plugin inline)); - push @command, qw(-underlaydir=underlays/basewiki); - push @command, qw(-set underlaydirbase=underlays --templatedir=templates); + my @command = (@base_command, qw(--plugin inline)); push @command, qw(t/tinypodcast), "$tmp/out"; ok(! system("mkdir $tmp"), -- cgit v1.2.3