Use config parameters directly and shorten long lines.

diff --git a/t/cvs.t b/t/cvs.t
index af1786c650325efacc4197135a7299eb706bbcfb..8b5bbb568f0b416cf445b2b26a86a39a3c57c372 100755 (executable)
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -51,13 +51,14 @@ sub _generate_minimal_config {
 }
 
 sub _create_test_repo {
-       my $cvsrepo = "$dir/repo";
-
-       system "cvs -d $cvsrepo init >/dev/null";
-       system "mkdir $dir/ikiwiki >/dev/null";
-       system "cd $dir/ikiwiki && cvs -d $cvsrepo import -m import ikiwiki VENDOR RELEASE >/dev/null";
-       system "rm -rf $dir/ikiwiki >/dev/null";
-       system "cvs -d $cvsrepo co -d $config{srcdir} ikiwiki >/dev/null";
+       my $cvs = "cvs -d $config{cvsrepo}";
+       my $dn = ">/dev/null";
+       system "$cvs init $dn";
+       system "mkdir $dir/$config{cvspath} $dn";
+       system "cd $dir/$config{cvspath} && "
+               . "$cvs import -m import $config{cvspath} VENDOR RELEASE $dn";
+       system "rm -rf $dir/$config{cvspath} $dn";
+       system "$cvs co -d $config{srcdir} $config{cvspath} $dn";
 }
 
 sub test_web_add_and_commit {