[PATCH jh/cvs-helper 2/2] t/test-lib.sh: don't perform python preparations when NO_PYTHON is set
From: Brandon Casey <hidden>
Date: 2016-06-15 22:47:19
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Brandon Casey <redacted> When setting GITPYTHONLIB, a check is performed to test whether the path that GITPYTHONLIB is set to is a valid directory. This test always fails when NO_PYTHON is set since git_remote_cvs is not built. So add a test on NO_PYTHON to the conditional that protects this section. Additionally, move this section down so it is done _after_ GIT-BUILD-OPTIONS is sourced, so that the NO_PYTHON setting is available. Signed-off-by: Brandon Casey <redacted> --- t/test-lib.sh | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index a7fbfef..d95c66b 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh@@ -638,15 +638,6 @@ test -d ../templates/blt || { error "You haven't built things yet, have you?" } -if test -z "$GIT_TEST_INSTALLED" -then - GITPYTHONLIB="$(pwd)/../git_remote_cvs/build/lib" - export GITPYTHONLIB - test -d ../git_remote_cvs/build || { - error "You haven't built git_remote_cvs yet, have you?" - } -fi - if ! test -x ../test-chmtime; then echo >&2 'You need to build test-chmtime:' echo >&2 'Run "make test-chmtime" in the source (toplevel) directory'
@@ -655,6 +646,15 @@ fi . ../GIT-BUILD-OPTIONS +if test -z "$NO_PYTHON" -a -z "$GIT_TEST_INSTALLED" +then + GITPYTHONLIB="$(pwd)/../git_remote_cvs/build/lib" + export GITPYTHONLIB + test -d ../git_remote_cvs/build || { + error "You haven't built git_remote_cvs yet, have you?" + } +fi + # Test repository test="trash directory.$(basename "$0" .sh)" test -n "$root" && test="$root/$test"
--
1.6.4