Rebuild for jessie-backports, no source changes (Closes: #807452)

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

diff --git a/t/podcast.t b/t/podcast.t
index f036c3113e4a1620b00dd50541be4a0a8956c18e..ef90b5205e49932075e9f87d38fc91797b992447 100755 (executable)
--- a/t/podcast.t
+++ b/t/podcast.t
@@ -23,10 +23,10 @@ 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));
+       my @command = (qw(./ikiwiki.out --plugin inline --rss --atom));

        push @command, qw(-underlaydir=underlays/basewiki);
        push @command, qw(-underlaydir=underlays/basewiki);

-       push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
-       push @command, "-url=$baseurl", qw(t/tinypodcast), "$tmp/out";
+       push @command, qw(-set underlaydirbase=underlays --templatedir=templates);
+       push @command, "--url=$baseurl", qw(t/tinypodcast), "$tmp/out";

 
        ok(! system("mkdir $tmp"),
                q{setup});
 
        ok(! system("mkdir $tmp"),
                q{setup});


@@ -37,7 +37,7 @@ sub podcast {
                'simplepost'    => undef,
                'piano.mp3'     => 'audio/mpeg',
                'scroll.3gp'    => 'video/3gpp',
                'simplepost'    => undef,
                'piano.mp3'     => 'audio/mpeg',
                'scroll.3gp'    => 'video/3gpp',

-               'walter.ogg'    => 'video/x-theora+ogg',
+               'walter.ogg'    => 'audio/ogg',

        );
 
        for my $format (qw(atom rss)) {
        );
 
        for my $format (qw(atom rss)) {


@@ -115,7 +115,7 @@ sub podcast {
 sub single_page_html {
        my @command = (qw(./ikiwiki.out));
        push @command, qw(-underlaydir=underlays/basewiki);
 sub single_page_html {
        my @command = (qw(./ikiwiki.out));
        push @command, qw(-underlaydir=underlays/basewiki);

-       push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
+       push @command, qw(-set underlaydirbase=underlays --templatedir=templates);

        push @command, qw(t/tinypodcast), "$tmp/out";
 
        ok(! system("mkdir $tmp"),
        push @command, qw(t/tinypodcast), "$tmp/out";
 
        ok(! system("mkdir $tmp"),


@@ -130,7 +130,7 @@ sub single_page_html {
                q{html enclosure});
        my ($href) = _extract_html_links($html, 'piano');
        is($href, '/piano.mp3',
                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,
 
        $html = "$tmp/out/attempted_multiple_enclosures/index.html";
        like(_extract_html_content($html, 'content'), qr/has content and/m,


@@ -139,28 +139,28 @@ sub single_page_html {
                q{html enclosure});
        ($href) = _extract_html_links($html, 'walter');
        is($href, '/walter.ogg',
                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';
 
        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",
 
        $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",
 
        $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 {
 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
 sub inlined_pages_html {

-       my @command = (qw(./ikiwiki.out -plugin inline));
+       my @command = (qw(./ikiwiki.out --plugin inline));

        push @command, qw(-underlaydir=underlays/basewiki);
        push @command, qw(-underlaydir=underlays/basewiki);

-       push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
+       push @command, qw(-set underlaydirbase=underlays --templatedir=templates);

        push @command, qw(t/tinypodcast), "$tmp/out";
 
        ok(! system("mkdir $tmp"),
        push @command, qw(t/tinypodcast), "$tmp/out";
 
        ok(! system("mkdir $tmp"),


@@ -179,10 +179,10 @@ sub inlined_pages_html {
                q{html enclosure});
        my ($href) = _extract_html_links($html, 'piano.mp3');
        is($href, '/piano.mp3',
                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',
        ($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});
 }
 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }