# HG changeset patch
# User Thomas Klausner <tk@giga.or.at>
# Date 1419798652 -3600
# Node ID 96529f81e2e9fd46645472e5ecac3f361888cd9b
# Parent  6e36b9fc78699801b16ea2c763f1483d1fa755d4
tests: run 'cvs init' only on non-existent directories (issue4482)

Do not create cvsroot directory since cvs-1.12 errors out
if CVSROOT exists before 'cvs init'.

diff --git a/tests/test-convert-cvs-branch.t b/tests/test-convert-cvs-branch.t
--- a/tests/test-convert-cvs-branch.t
+++ b/tests/test-convert-cvs-branch.t
@@ -23,6 +23,7 @@
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
+  $ rmdir cvsrepo
   $ cvscall -q -d "$CVSROOT" init
 
 Create a new project
diff --git a/tests/test-convert-cvs-detectmerge.t b/tests/test-convert-cvs-detectmerge.t
--- a/tests/test-convert-cvs-detectmerge.t
+++ b/tests/test-convert-cvs-detectmerge.t
@@ -33,7 +33,6 @@
 
 create cvs repository with one project
 
-  $ mkdir cvsrepo
   $ cvscall -q -d "$CVSROOT" init
   $ mkdir cvsrepo/proj
 
diff --git a/tests/test-convert-cvs-synthetic.t b/tests/test-convert-cvs-synthetic.t
--- a/tests/test-convert-cvs-synthetic.t
+++ b/tests/test-convert-cvs-synthetic.t
@@ -14,6 +14,7 @@
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
+  $ rmdir cvsrepo
   $ cvscall()
   > {
   >     cvs -f "$@"
diff --git a/tests/test-convert-cvs.t b/tests/test-convert-cvs.t
--- a/tests/test-convert-cvs.t
+++ b/tests/test-convert-cvs.t
@@ -33,6 +33,7 @@
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
+  $ rmdir cvsrepo
   $ cvscall -q -d "$CVSROOT" init
 
 create source directory
diff --git a/tests/test-convert-cvsnt-mergepoints.t b/tests/test-convert-cvsnt-mergepoints.t
--- a/tests/test-convert-cvsnt-mergepoints.t
+++ b/tests/test-convert-cvsnt-mergepoints.t
@@ -32,6 +32,7 @@
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
+  $ rmdir cvsmaster
   $ filterpath cvscall -Q -d "$CVSROOT" init
 
 checkout #1: add foo.txt