[PATCH 3/4] Test contents of entire cvsimported "master" tree contents
From: Michael Haggerty <hidden>
Date: 2016-06-15 22:46:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Test added for completeness (it passes). Signed-off-by: Michael Haggerty <redacted> --- t/t9600-cvsimport.sh | 2 ++ t/t96xx/cvs-lib.sh | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 66393ae..dad9d49 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh@@ -121,4 +121,6 @@ test_expect_success 'import from a CVS working tree' ' ' +test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' + test_done
diff --git a/t/t96xx/cvs-lib.sh b/t/t96xx/cvs-lib.sh
index 6738901..0136b36 100644
--- a/t/t96xx/cvs-lib.sh
+++ b/t/t96xx/cvs-lib.sh@@ -32,3 +32,28 @@ case "$cvsps_version" in exit ;; esac + +test_cvs_co () { + # Usage: test_cvs_co BRANCH_NAME + if [ "$1" = "master" ] + then + $CVS co -P -d module-cvs-"$1" -A module + else + $CVS co -P -d module-cvs-"$1" -b "$1" module + fi +} + +test_git_co_branch () { + # Usage: test_git_co BRANCH_NAME + (cd module-git && git checkout "$1") +} + +test_cmp_branch_tree () { + # Usage: test_cmp_branch_tree BRANCH_NAME + # Check BRANCH_NAME out of CVS and git and make sure that all + # of the files and directories are identical. + + test_cvs_co "$1" && + test_git_co_branch "$1" && + diff -r -x .git -x CVS module-cvs-"$1" module-git +}
--
1.6.1.3