oh, and spamassassin too

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

diff --git a/t/podcast.t b/t/podcast.t
index c698d1835d5de1fe8ed1345afb87ac3d71c34b0e..7b0987e21321f2e7738b71903a8381da3361a0b1 100755 (executable)
--- a/t/podcast.t
+++ b/t/podcast.t
@@ -9,7 +9,7 @@ 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 => 137};
+               eval q{use Test::More};

        }
 }
 
        }
 }
 


@@ -25,10 +25,10 @@ if ($installed) {
 }
 else {
        ok(! system("make -s ikiwiki.out"));
 }
 else {
        ok(! system("make -s ikiwiki.out"));

-       @base_command = qw(perl -I. ./ikiwiki.out
+       @base_command = ("perl", "-I".getcwd, qw(./ikiwiki.out

                --underlaydir=underlays/basewiki
                --set underlaydirbase=underlays
                --underlaydir=underlays/basewiki
                --set underlaydirbase=underlays

-               --templatedir=templates);
+               --templatedir=templates));

 }
 
 my $tmp = 't/tmp';
 }
 
 my $tmp = 't/tmp';


@@ -41,6 +41,8 @@ sub podcast {
        my @command = (@base_command, qw(--plugin inline --rss --atom));
        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("rm -rf $tmp $statedir"), q{setup});
+

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


@@ -121,14 +123,14 @@ sub podcast {
                        }
                }
        }
                        }
                }
        }

-
-       ok(! system("rm -rf $tmp $statedir"), q{teardown});

 }
 
 sub single_page_html {
        my @command = @base_command;
        push @command, qw(t/tinypodcast), "$tmp/out";
 
 }
 
 sub single_page_html {
        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),
        ok(! system("mkdir $tmp"),
                q{setup});
        ok(! system(@command),


@@ -172,6 +174,8 @@ sub inlined_pages_html {
        my @command = (@base_command, qw(--plugin inline));
        push @command, qw(t/tinypodcast), "$tmp/out";
 
        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),
        ok(! system("mkdir $tmp"),
                q{setup});
        ok(! system(@command),


@@ -240,3 +244,5 @@ podcast('simple');
 single_page_html();
 inlined_pages_html();
 podcast('fancy');
 single_page_html();
 inlined_pages_html();
 podcast('fancy');

+
+done_testing;