Patchwork tests: run 'cvs init' only on non-existent directories (issue4482)

login
register
mail settings
Submitter Thomas Klausner
Date Dec. 28, 2014, 8:32 p.m.
Message ID <20141228203205.GU7071@danbala.tuwien.ac.at>
Download mbox | patch
Permalink /patch/7251/
State Accepted
Commit 96529f81e2e9fd46645472e5ecac3f361888cd9b
Headers show

Comments

Thomas Klausner - Dec. 28, 2014, 8:32 p.m.
# HG changeset patch
# User Thomas Klausner <tk@giga.or.at>
# Date 1419798652 -3600
#      Sun Dec 28 21:30:52 2014 +0100
# Node ID 293fdf449abd96eae197ee3a29b3efd86e2c00b1
# Parent  67d63ec85eb72187508692e52f14be46101707a5
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'.

Patch

diff -r 67d63ec85eb7 -r 293fdf449abd tests/test-convert-cvs-branch.t
--- a/tests/test-convert-cvs-branch.t	Sun Dec 07 01:32:30 2014 -0500
+++ b/tests/test-convert-cvs-branch.t	Sun Dec 28 21:30:52 2014 +0100
@@ -23,6 +23,7 @@ 
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
+  $ rmdir cvsrepo
   $ cvscall -q -d "$CVSROOT" init
 
 Create a new project
diff -r 67d63ec85eb7 -r 293fdf449abd tests/test-convert-cvs-detectmerge.t
--- a/tests/test-convert-cvs-detectmerge.t	Sun Dec 07 01:32:30 2014 -0500
+++ b/tests/test-convert-cvs-detectmerge.t	Sun Dec 28 21:30:52 2014 +0100
@@ -33,7 +33,6 @@ 
 
 create cvs repository with one project
 
-  $ mkdir cvsrepo
   $ cvscall -q -d "$CVSROOT" init
   $ mkdir cvsrepo/proj
 
diff -r 67d63ec85eb7 -r 293fdf449abd tests/test-convert-cvs-synthetic.t
--- a/tests/test-convert-cvs-synthetic.t	Sun Dec 07 01:32:30 2014 -0500
+++ b/tests/test-convert-cvs-synthetic.t	Sun Dec 28 21:30:52 2014 +0100
@@ -14,6 +14,7 @@ 
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
+  $ rmdir cvsrepo
   $ cvscall()
   > {
   >     cvs -f "$@"
diff -r 67d63ec85eb7 -r 293fdf449abd tests/test-convert-cvs.t
--- a/tests/test-convert-cvs.t	Sun Dec 07 01:32:30 2014 -0500
+++ b/tests/test-convert-cvs.t	Sun Dec 28 21:30:52 2014 +0100
@@ -33,6 +33,7 @@ 
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
+  $ rmdir cvsrepo
   $ cvscall -q -d "$CVSROOT" init
 
 create source directory
diff -r 67d63ec85eb7 -r 293fdf449abd tests/test-convert-cvsnt-mergepoints.t
--- a/tests/test-convert-cvsnt-mergepoints.t	Sun Dec 07 01:32:30 2014 -0500
+++ b/tests/test-convert-cvsnt-mergepoints.t	Sun Dec 28 21:30:52 2014 +0100
@@ -32,6 +32,7 @@ 
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
+  $ rmdir cvsmaster
   $ filterpath cvscall -Q -d "$CVSROOT" init
 
 checkout #1: add foo.txt