X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/460b1a0debf85f7c54c1dd7d8b8e483587041d44..d4136aea8aa8968d2cd87b40e8d85301a3549323:/t/cvs.t

diff --git a/t/cvs.t b/t/cvs.t
index 9df62334d..96359ab6e 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -6,9 +6,19 @@ 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 || ! mkdir($dir)) {
 		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 or could not make test dir"
+		}
+	}
+	foreach my $module ('File::ReadBackwards', 'File::MimeInfo') {
+		eval qq{use $module};
+		if ($@) {
+			eval qq{
+				use Test::More skip_all => "$module not available"
+			}
 		}
 	}
 }
@@ -36,7 +46,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");
-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);