Merge branch 'master' into debian-jessie-backports

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

diff --git a/t/podcast.t b/t/podcast.t
index ef90b5205e49932075e9f87d38fc91797b992447..708ac7640322f58fbb02d2cca622e6e115325724 100755 (executable)
--- 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 {
                        "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;
 
        }
 }
 
 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';
 
 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 $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"),
        push @command, "--url=$baseurl", qw(t/tinypodcast), "$tmp/out";
 
        ok(! system("mkdir $tmp"),


@@ -113,9 +126,7 @@ sub podcast {
 }
 
 sub single_page_html {
 }
 
 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"),
        push @command, qw(t/tinypodcast), "$tmp/out";
 
        ok(! system("mkdir $tmp"),


@@ -158,9 +169,7 @@ sub single_page_html {
 }
 
 sub inlined_pages_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"),
        push @command, qw(t/tinypodcast), "$tmp/out";
 
        ok(! system("mkdir $tmp"),