Patrick Steinhardt <ps@xxxxxx> writes: > Both t9835 and t9836 exercise git-p4, but one exercises Python 2 whereas > the other one uses Python 3. These tests do not exercise "git p4", but > instead they use "git p4.py" so that the unbuilt version of "git-p4.py" > is used that has "#!/usr/bin/env python" as shebang instead of the > replaced shebang. > > But "git-p4.py" is not in our PATH during out-of-tree builds, and thus > we cannot locate "git-p4.py". The tests thus break with CMake and Meson. > > Fix this by instead manually setting up script wrappers that invoke the > respective Python interpreter directly. > > Signed-off-by: Patrick Steinhardt <ps@xxxxxx> > --- > t/t9835-git-p4-metadata-encoding-python2.sh | 48 ++++++++++++++------------- > t/t9836-git-p4-metadata-encoding-python3.sh | 50 ++++++++++++++--------------- > 2 files changed, 50 insertions(+), 48 deletions(-) > > diff --git a/t/t9835-git-p4-metadata-encoding-python2.sh b/t/t9835-git-p4-metadata-encoding-python2.sh > index 036bf79c6674f6f1f0d667c7270674168428ffee..02f9ec09053890a4d41b7dc95644066d6481bbb6 100755 > --- a/t/t9835-git-p4-metadata-encoding-python2.sh > +++ b/t/t9835-git-p4-metadata-encoding-python2.sh > @@ -14,23 +14,25 @@ python_target_version='2' > ## SECTION REPEATED IN t9836 ## > ############################### > > -# Please note: this test calls "git-p4.py" rather than "git-p4", because the > -# latter references a specific path so we can't easily force it to run under > -# the python version we need to. > - > -python_major_version=$(python -V 2>&1 | cut -c 8) > -python_target_binary=$(which python$python_target_version) > -if ! test "$python_major_version" = "$python_target_version" && test "$python_target_binary" > +# 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 > - ln -s $python_target_binary temp_python/python > + PATH="$(pwd)/temp_python:$PATH" > + export PATH > + > + write_script temp_python/git-p4-python2 <<-EOF > + exec "$python_target_binary" "$(git --exec-path)/git-p4" "\$@" > + EOF > fi > So if the python version (2 here), is available, we create a temp script which will use that version. That script is then used in all the commands below. Makes sense. This is similarly replicated in `t9836` but with Python 3. [snip]
Attachment:
signature.asc
Description: PGP signature
