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 94505a05e2ca70dabcbdd28f4cda14be353fbf9f..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 {
-               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 = ("perl", "-I".getcwd, qw(./ikiwiki.out
+               --underlaydir=underlays/basewiki
+               --set underlaydirbase=underlays
+               --templatedir=templates));
+}
+
 my $tmp = 't/tmp';
 my $statedir = 't/tinypodcast/.ikiwiki';
 
@@ -23,10 +38,8 @@ 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);
-       push @command, "-url=$baseurl", qw(t/tinypodcast), "$tmp/out";
+       my @command = (@base_command, qw(--plugin inline --rss --atom));
+       push @command, "--url=$baseurl", qw(t/tinypodcast), "$tmp/out";
 
        ok(! system("mkdir $tmp"),
                q{setup});
@@ -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"),
@@ -130,7 +141,7 @@ sub single_page_html {
                q{html enclosure});
        my ($href) = _extract_html_links($html, 'piano');
        is($href, '/piano.mp3',
-               q{html enclosure sans -url is site-absolute});
+               q{html enclosure sans --url is site-absolute});
 
        $html = "$tmp/out/attempted_multiple_enclosures/index.html";
        like(_extract_html_content($html, 'content'), qr/has content and/m,
@@ -139,28 +150,26 @@ sub single_page_html {
                q{html enclosure});
        ($href) = _extract_html_links($html, 'walter');
        is($href, '/walter.ogg',
-               q{html enclosure sans -url is site-absolute});
+               q{html enclosure sans --url is site-absolute});
 
        my $baseurl = 'http://example.com';
-       ok(! system(@command, "-url=$baseurl", q{--rebuild}));
+       ok(! system(@command, "--url=$baseurl", q{--rebuild}));
 
        $html = "$tmp/out/pianopost/index.html";
        ($href) = _extract_html_links($html, 'piano');
        is($href, "$baseurl/piano.mp3",
-               q{html enclosure with -url is fully absolute});
+               q{html enclosure with --url is fully absolute});
 
        $html = "$tmp/out/attempted_multiple_enclosures/index.html";
        ($href) = _extract_html_links($html, 'walter');
        is($href, "$baseurl/walter.ogg",
-               q{html enclosure with -url is fully absolute});
+               q{html enclosure with --url is fully absolute});
 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
 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"),
@@ -179,10 +188,10 @@ sub inlined_pages_html {
                q{html enclosure});
        my ($href) = _extract_html_links($html, 'piano.mp3');
        is($href, '/piano.mp3',
-               q{html enclosure from pianopost sans -url});
+               q{html enclosure from pianopost sans --url});
        ($href) = _extract_html_links($html, 'walter.ogg');
        is($href, '/walter.ogg',
-               q{html enclosure from attempted_multiple_enclosures sans -url});
+               q{html enclosure from attempted_multiple_enclosures sans --url});
 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }