diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:16 -0800 |
| commit | e74f43f9b702ccb88ee83e28de13ccfaebc4abf2 (patch) | |
| tree | ae30da1b3a75cb017064b497cf5a59d5c30e9b6b /t | |
| parent | 902f235378cb2b2f6dd5dd664b9630c95321f0ae (diff) | |
| parent | ac10a85785baee56bb4a04ad5f847d15ffba0893 (diff) | |
| download | git-e74f43f9b702ccb88ee83e28de13ccfaebc4abf2.tar.gz git-e74f43f9b702ccb88ee83e28de13ccfaebc4abf2.tar.xz | |
Merge branch 'sr/vcs-helper'
* sr/vcs-helper:
tests: handle NO_PYTHON setting
builtin-push: don't access freed transport->url
Add Python support library for remote helpers
Basic build infrastructure for Python scripts
Allow helpers to report in "list" command that the ref is unchanged
Fix various memory leaks in transport-helper.c
Allow helper to map private ref names into normal names
Add support for "import" helper command
Allow specifying the remote helper in the url
Add a config option for remotes to specify a foreign vcs
Allow fetch to modify refs
Use a function to determine whether a remote is valid
Allow programs to not depend on remotes having urls
Fix memory leak in helper method for disconnect
Conflicts:
Documentation/git-remote-helpers.txt
Makefile
builtin-ls-remote.c
builtin-push.c
transport-helper.c
Diffstat (limited to 't')
| -rw-r--r-- | t/test-lib.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index ec3336aba..2d523fe0f 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -632,20 +632,29 @@ GIT_CONFIG_NOSYSTEM=1 GIT_CONFIG_NOGLOBAL=1 export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL +. ../GIT-BUILD-OPTIONS + GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git export GITPERLLIB test -d ../templates/blt || { error "You haven't built things yet, have you?" } +if test -z "$GIT_TEST_INSTALLED" && test -z "$NO_PYTHON" +then + GITPYTHONLIB="$(pwd)/../git_remote_helpers/build/lib" + export GITPYTHONLIB + test -d ../git_remote_helpers/build || { + error "You haven't built git_remote_helpers 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' exit 1 fi -. ../GIT-BUILD-OPTIONS - # Test repository test="trash directory.$(basename "$0" .sh)" test -n "$root" && test="$root/$test" @@ -729,6 +738,7 @@ case $(uname -s) in esac test -z "$NO_PERL" && test_set_prereq PERL +test -z "$NO_PYTHON" && test_set_prereq PYTHON # test whether the filesystem supports symbolic links ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS |