admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

t983*: use prereq to check for Python-specific git-p4(1) support

Browse Source 
The tests in t9835 and t9836 verify that git-p4(1) works with both
Python 2 and 3, respectively. To determine whether we have those Python
versions in the first place we create a wrapper script that directly
executes the git-p4(1) script with `python2` or `python3` binaries. We
then condition the execution of tests on whether that wrapper script can
be executed successfully.

The logic that does all of this is not contained in a prerequisite block
though, so the output it generates causes us to break the TAP format.
Refactor the logic to use `test_lazy_prereq()` to fix this.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-06-02 08:44:44 +02:00
committed by Junio C Hamano
parent 844537091d
commit a1199a2389
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
t/t9835-git-p4-metadata-encoding-python2.sh
View File

@@ -12,23 +12,25 @@ failing, and produces maximally sane output in git.'
## SECTION REPEATED IN t9836 ##
###############################
EXTRA_PATH="$(pwd)/temp_python"
mkdir "$EXTRA_PATH"
PATH="$EXTRA_PATH:$PATH"
export PATH
# These tests are specific to Python 2. Write a custom script that executes
# git-p4 directly with the Python 2 interpreter to ensure that we use that
# version even if Git was compiled with Python 3.
python_target_binary=$(which python2)
if test -n "$python_target_binary"
then
mkdir temp_python
PATH="$(pwd)/temp_python:$PATH"
export PATH
write_script temp_python/git-p4-python2 <<-EOF
test_lazy_prereq P4_PYTHON2 '
python_target_binary=$(which python2) &&
test -n "$python_target_binary" &&
write_script "$EXTRA_PATH"/git-p4-python2 <<-EOF &&
exec "$python_target_binary" "$(git --exec-path)/git-p4" "\$@"
EOF
fi
( git p4-python2 || true ) >err &&
test_grep "valid commands" err
'
git p4-python2 >err
if ! grep 'valid commands' err
if ! test_have_prereq P4_PYTHON2
then
skip_all="skipping python2 git p4 tests; python2 not available"
test_done

24
t/t9836-git-p4-metadata-encoding-python3.sh
View File

@@ -12,23 +12,25 @@ failing, and produces maximally sane output in git.'
## SECTION REPEATED IN t9835 ##
###############################
EXTRA_PATH="$(pwd)/temp_python"
mkdir "$EXTRA_PATH"
PATH="$EXTRA_PATH:$PATH"
export PATH
# These tests are specific to Python 3. Write a custom script that executes
# git-p4 directly with the Python 3 interpreter to ensure that we use that
# version even if Git was compiled with Python 2.
python_target_binary=$(which python3)
if test -n "$python_target_binary"
then
mkdir temp_python
PATH="$(pwd)/temp_python:$PATH"
export PATH
write_script temp_python/git-p4-python3 <<-EOF
test_lazy_prereq P4_PYTHON3 '
python_target_binary=$(which python3) &&
test -n "$python_target_binary" &&
write_script "$EXTRA_PATH"/git-p4-python3 <<-EOF &&
exec "$python_target_binary" "$(git --exec-path)/git-p4" "\$@"
EOF
fi
( git p4-python3 || true ) >err &&
test_grep "valid commands" err
'
git p4-python3 >err
if ! grep 'valid commands' err
if ! test_have_prereq P4_PYTHON3
then
skip_all="skipping python3 git p4 tests; python3 not available"
test_done