(no commit message)

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

diff --git a/t/cvs.t b/t/cvs.t
index c9caa94eb308041e0b78ff4d9eddfe86cb331f65..5ed377ed5e7234b369cc456d814e4ceefb51266c 100755 (executable)
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -8,9 +8,20 @@ BEGIN {
        chomp $cvs;
        my $cvsps=`which cvsps`;
        chomp $cvsps;
        chomp $cvs;
        my $cvsps=`which cvsps`;
        chomp $cvsps;

-       if (! -x $cvs || ! -x $cvsps || ! mkdir($dir)) {
+       if (! -x $cvs || ! -x $cvsps) {

                eval q{
                eval q{

-                       use Test::More skip_all => "cvs or cvsps not available or could not make test dir"
+                       use Test::More skip_all => "cvs or cvsps not available"
+               }
+       }
+       if (! mkdir($dir)) {
+               die $@;
+       }
+       foreach my $module ('File::ReadBackwards', 'File::MimeInfo') {
+               eval qq{use $module};
+               if ($@) {
+                       eval qq{
+                               use Test::More skip_all => "$module not available"
+                       }

                }
        }
 }
                }
        }
 }


@@ -38,7 +49,11 @@ system "cvs -d $cvsrepo co -d $config{srcdir} ikiwiki >/dev/null";
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");

-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
+IkiWiki::rcs_commit(
+       files => "test1.mdwn",
+       message => "Added the first page",
+       token => "moo"
+);

 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);