[PATCH] t9010: svnadmin can fail even if available

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jan 6, 2011, 18:00 UTC
Message-ID: <20110106180051.GC11346@burratino>
In-Reply-To: <4D25F9C5.6030503@gmail.com>

If svn is built against one version of SQLite and run against another, svnadmin (needlessly) errors out during t9010:

 <<< Started new transaction, based on original revision 1
      * adding path : branches ... done.
      * adding path : trunk ... done.
 svnadmin: Couldn't perform atomic initialization
 svnadmin: Couldn't perform atomic initialization
 svnadmin: SQLite compiled for 3.7.4, but running with 3.7.3

Work around this by putting the svn invocations into a single test that builds a repo to compare the test-svn-fe result against. This test would always pass but only set the new SVNREPO test prereq if svn succeeds; and the test using that repo gets an SVNREPO prerequisite so it only runs with working svn installations.

This seems like the right thing to, anyway: the test script is meant to test the version of git just built, not the installed svn.

As a side effect, earlier tests will run now even if svn is not installed. Remove the svn_cmd () helper to decrease the temptation to run svn from those tests.

Works-around: http://bugs.debian.org/608925
Reported-by: A Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Thanks.  Does this patch work for you?

 t/t9010-svn-fe.sh |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index c96bf2f..88a9751 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -4,22 +4,6 @@ test_description='check svn dumpfile importer'
 
 . ./test-lib.sh
 
-if ! svnadmin -h >/dev/null 2>&1
-then
-	skip_all='skipping svn-fe tests, svn not available'
-	test_done
-fi
-
-svnconf=$PWD/svnconf
-export svnconf
-
-svn_cmd () {
-	subcommand=$1 &&
-	shift &&
-	mkdir -p "$svnconf" &&
-	svn "$subcommand" --config-dir "$svnconf" "$@"
-}
-
 reinit_git () {
 	rm -fr .git &&
 	git init
@@ -41,10 +25,21 @@ test_expect_success 'v3 dumps not supported' '
 	test_cmp empty stream
 '
 
-test_expect_success 't9135/svn.dump' '
-	svnadmin create simple-svn &&
-	svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
-	svn_cmd export "file://$PWD/simple-svn" simple-svnco &&
+test_expect_success 'set up svn repo' '
+	svnconf=$PWD/svnconf &&
+	mkdir -p "$svnconf" &&
+
+	if
+		svnadmin -h >/dev/null 2>&1 &&
+		svnadmin create simple-svn &&
+		svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
+		svn export --config-dir "$svnconf" "file://$PWD/simple-svn" simple-svnco
+	then
+		test_set_prereq SVNREPO
+	fi
+'
+
+test_expect_success SVNREPO 't9135/svn.dump' '
 	git init simple-git &&
 	test-svn-fe "$TEST_DIRECTORY/t9135/svn.dump" >simple.fe &&
 	(

-- 
1.7.4.rc1