git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, Johannes.Schindelin@gmx.de,
	jnareb@gmail.com, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 1/5] Start a library for cvsimport-related tests
Date: Sat, 21 Feb 2009 14:04:36 +0100	[thread overview]
Message-ID: <ee46eff8fc1cb2d0ad3d8dfac2fbe4d79f225e3a.1235220105.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <1235221480-31473-1-git-send-email-mhagger@alum.mit.edu>

For now the "library" just includes code (moved from
t/t9600-cvsimport.sh) that checks whether the prerequisites for "git
cvsimport" are installed.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 t/lib-cvs.sh         |   31 +++++++++++++++++++++++++++++++
 t/t9600-cvsimport.sh |   29 +----------------------------
 2 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100644 t/lib-cvs.sh

diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh
new file mode 100644
index 0000000..bfc1c12
--- /dev/null
+++ b/t/lib-cvs.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+. ./test-lib.sh
+
+unset CVS_SERVER
+# for clean cvsps cache
+HOME=$(pwd)
+export HOME
+
+if ! type cvs >/dev/null 2>&1
+then
+	say 'skipping cvsimport tests, cvs not found'
+	test_done
+	exit
+fi
+
+cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
+case "$cvsps_version" in
+2.1 | 2.2*)
+	;;
+'')
+	say 'skipping cvsimport tests, cvsps not found'
+	test_done
+	exit
+	;;
+*)
+	say 'skipping cvsimport tests, unsupported cvsps version'
+	test_done
+	exit
+	;;
+esac
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index d2379e7..98077ab 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -1,37 +1,10 @@
 #!/bin/sh
 
 test_description='git cvsimport basic tests'
-. ./test-lib.sh
+. ./lib-cvs.sh
 
 CVSROOT=$(pwd)/cvsroot
 export CVSROOT
-unset CVS_SERVER
-# for clean cvsps cache
-HOME=$(pwd)
-export HOME
-
-if ! type cvs >/dev/null 2>&1
-then
-	say 'skipping cvsimport tests, cvs not found'
-	test_done
-	exit
-fi
-
-cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
-case "$cvsps_version" in
-2.1 | 2.2*)
-	;;
-'')
-	say 'skipping cvsimport tests, cvsps not found'
-	test_done
-	exit
-	;;
-*)
-	say 'skipping cvsimport tests, unsupported cvsps version'
-	test_done
-	exit
-	;;
-esac
 
 test_expect_success 'setup cvsroot' 'cvs init'
 
-- 
1.6.1.3

  reply	other threads:[~2009-02-21 13:07 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-21 13:04 [PATCH v2 0/4] Add more tests of cvsimport Michael Haggerty
2009-02-21 13:04 ` Michael Haggerty [this message]
2009-02-21 13:04   ` [PATCH v2 2/5] Use CVS's -f option if available (ignore user's ~/.cvsrc file) Michael Haggerty
2009-02-21 13:04     ` [PATCH v2 3/5] Test contents of entire cvsimported "master" tree contents Michael Haggerty
2009-02-21 13:04       ` [PATCH v2 4/5] Add some tests of git-cvsimport's handling of vendor branches Michael Haggerty
2009-02-21 13:04         ` [PATCH v2 5/5] Add a test of "git cvsimport"'s handling of tags and branches Michael Haggerty
2009-02-22 16:49         ` [PATCH v2 4/5] Add some tests of git-cvsimport's handling of vendor branches Junio C Hamano
2009-02-23  5:08           ` [PATCH v3 0/5] Add more tests of cvsimport Michael Haggerty
2009-02-23  5:08             ` [PATCH v3 1/5] Start a library for cvsimport-related tests Michael Haggerty
2009-02-23  5:08               ` [PATCH v3 2/5] Use CVS's -f option if available (ignore user's ~/.cvsrc file) Michael Haggerty
2009-02-23  5:08                 ` [PATCH v3 3/5] Test contents of entire cvsimported "master" tree contents Michael Haggerty
2009-02-23  5:08                   ` [PATCH v3 4/5] Add some tests of git-cvsimport's handling of vendor branches Michael Haggerty
2009-02-23  5:08                     ` [PATCH v3 5/5] Add a test of "git cvsimport"'s handling of tags and branches Michael Haggerty
2009-02-22 16:48 ` [PATCH v2 0/4] Add more tests of cvsimport Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ee46eff8fc1cb2d0ad3d8dfac2fbe4d79f225e3a.1235220105.git.mhagger@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jnareb@gmail.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).