X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a1fda0b516cc4e85b7304838949df8fbe0044cf3..e8432b28accf3326d00363c911fa6166321c3a80:/t/podcast.t

diff --git a/t/podcast.t b/t/podcast.t
index ef90b5205..7b0987e21 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};
 	}
 }
 
 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 = ("perl", "-I".getcwd, qw(./ikiwiki.out
+		--underlaydir=underlays/basewiki
+		--set underlaydirbase=underlays
+		--templatedir=templates));
+}
+
 my $tmp = 't/tmp';
 my $statedir = 't/tinypodcast/.ikiwiki';
 
@@ -23,11 +38,11 @@ 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("rm -rf $tmp $statedir"), q{setup});
+
 	ok(! system("mkdir $tmp"),
 		q{setup});
 	ok(! system(@command),
@@ -108,16 +123,14 @@ sub podcast {
 			}
 		}
 	}
-
-	ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
 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("rm -rf $tmp $statedir"), q{setup});
+
 	ok(! system("mkdir $tmp"),
 		q{setup});
 	ok(! system(@command),
@@ -158,11 +171,11 @@ 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("rm -rf $tmp $statedir"), q{setup});
+
 	ok(! system("mkdir $tmp"),
 		q{setup});
 	ok(! system(@command),
@@ -231,3 +244,5 @@ podcast('simple');
 single_page_html();
 inlined_pages_html();
 podcast('fancy');
+
+done_testing;