more thoughts

[ikiwiki.git] / t / cvs.t

diff --git a/t/cvs.t b/t/cvs.t
index c3612ef8c18509989fd303206745c9bc8e22a6cc..5ed377ed5e7234b369cc456d814e4ceefb51266c 100755 (executable)
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -6,9 +6,22 @@ BEGIN {
        $dir="/tmp/ikiwiki-test-cvs.$$";
        my $cvs=`which cvs`;
        chomp $cvs;
-       if (! -x $cvs || ! mkdir($dir)) {
+       my $cvsps=`which cvsps`;
+       chomp $cvsps;
+       if (! -x $cvs || ! -x $cvsps) {
                eval q{
-                       use Test::More skip_all => "cvs 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"
+                       }
                }
        }
 }
@@ -28,18 +41,19 @@ my $cvsrepo = "$dir/repo";
 
 system "cvs -d $cvsrepo init >/dev/null";
 system "mkdir $dir/ikiwiki >/dev/null";
-my $cwd = `pwd`; chomp $cwd;
 system "cd $dir/ikiwiki && cvs -d $cvsrepo import -m import ikiwiki VENDOR RELEASE >/dev/null";
-chdir $cwd;
 system "rm -rf $dir/ikiwiki >/dev/null";
 system "cvs -d $cvsrepo co -d $config{srcdir} ikiwiki >/dev/null";
 
 # Web commit
-chdir $cwd;
 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);
@@ -51,12 +65,10 @@ is($changes[0]{pages}[0]{"page"}, "test1");
 # Manual commit
 my $message = "Added the second page";
 
-chdir $cwd;
 my $test2 = readfile("t/test2.mdwn");
 writefile('test2.mdwn', $config{srcdir}, $test2);
-chdir $config{srcdir};
-system "cvs add test2.mdwn >/dev/null 2>&1";
-system "cvs commit -m \"$message\" test2.mdwn >/dev/null";
+system "cd $config{srcdir} && cvs add test2.mdwn >/dev/null 2>&1";
+system "cd $config{srcdir} && cvs commit -m \"$message\" test2.mdwn >/dev/null";
 
 @changes = IkiWiki::rcs_recentchanges(3);
 is($#changes, 1);