clean up messages about unavailable vcs programs

master
Joey Hess 2010-06-25 00:30:12 -04:00
parent d8d057c356
commit 1f6ea9a626
5 changed files with 25 additions and 10 deletions

View File

@ -6,11 +6,14 @@ BEGIN {
$dir = "/tmp/ikiwiki-test-bzr.$$";
my $bzr=`which bzr`;
chomp $bzr;
if (! -x $bzr || ! mkdir($dir)) {
if (! -x $bzr) {
eval q{
use Test::More skip_all => "bzr not available or could not make test dir"
use Test::More skip_all => "bzr not available"
}
}
if (! mkdir($dir)) {
die $@;
}
}
use Test::More tests => 17;

View File

@ -8,11 +8,14 @@ BEGIN {
chomp $cvs;
my $cvsps=`which cvsps`;
chomp $cvsps;
if (! -x $cvs || ! -x $cvsps || ! mkdir($dir)) {
if (! -x $cvs || ! -x $cvsps) {
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 ($@) {

View File

@ -7,11 +7,14 @@ BEGIN {
$dir="/tmp/ikiwiki-test-git.$$";
my $git=`which git`;
chomp $git;
if (! -x $git || ! mkdir($dir)) {
if (! -x $git) {
eval q{
use Test::More skip_all => "git not available or could not make test dir"
use Test::More skip_all => "git not available"
}
}
if (! mkdir($dir)) {
die $@;
}
}
use Test::More tests => 18;

View File

@ -6,11 +6,14 @@ BEGIN {
$dir = "/tmp/ikiwiki-test-hg.$$";
my $hg=`which hg`;
chomp $hg;
if (! -x $hg || ! mkdir($dir)) {
if (! -x $hg) {
eval q{
use Test::More skip_all => "hg not available or could not make test dir"
use Test::More skip_all => "hg not available"
}
}
if (! mkdir($dir)) {
die $@;
}
}
use Test::More tests => 11;

View File

@ -8,11 +8,14 @@ BEGIN {
chomp $svn;
my $svnadmin=`which svnadmin`;
chomp $svnadmin;
if (! -x $svn || ! -x $svnadmin || ! mkdir($dir)) {
if (! -x $svn || ! -x $svnadmin) {
eval q{
use Test::More skip_all => "svn not available or could not make test dir"
use Test::More skip_all => "svn or svnadmin not available"
}
}
if (! mkdir($dir)) {
die $@;
}
}
use Test::More tests => 12;