From: Pete Wyckoff <pw@padd.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] t9020: use configured Python to run test helper
Date: Wed, 19 Dec 2012 08:15:40 -0500 [thread overview]
Message-ID: <20121219131540.GA14207@padd.com> (raw)
In-Reply-To: <7vip7yd4u2.fsf@alter.siamese.dyndns.org>
gitster@pobox.com wrote on Tue, 18 Dec 2012 20:49 -0800:
> The test helper svnrdump_sim.py is used as "svnrdump" during the
> execution of this test, but the arrangement had a few undesirable
> things:
>
> - it relied on symbolic links;
> - unportable "export VAR=VAL" was used;
> - GIT_BUILD_DIR variable was not quoted correctly;
> - it assumed that the Python interpreter is in /usr/bin/ and
> called "python" (i.e. not "python2.7" etc.)
>
> Rework this by writing a small shell script that spawns the right
> Python interpreter, using the right quoting.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>
> * The analysis above counts more bugs than the number of lines that
> are deleted in this section of the code...
>
> t/t9020-remote-svn.sh | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
> index 4f2dfe0..d7be66a 100755
> --- a/t/t9020-remote-svn.sh
> +++ b/t/t9020-remote-svn.sh
> @@ -12,9 +12,13 @@ then
> test_done
> fi
>
> -# We override svnrdump by placing a symlink to the svnrdump-emulator in .
> -export PATH="$HOME:$PATH"
> -ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump"
> +# Override svnrdump with our simulator
> +PATH="$HOME:$PATH"
> +export PATH PYTHON_PATH GIT_BUILD_DIR
> +
> +write_script "$HOME/svnrdump" <<\EOF
> +exec "$PYTHON_PATH" "$GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py" "$@"
> +EOF
You don't really need to export PYTHON_PATH and GIT_BUILD_DIR if
you get them expanded in the svnrdump script wrapper. Unquote
the EOF but add \ for $@.
Either way it's a nice improvement, especially with the
bugs/lines metric being >1.
-- Pete
prev parent reply other threads:[~2012-12-19 13:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-19 4:49 [PATCH] t9020: use configured Python to run test helper Junio C Hamano
2012-12-19 13:15 ` Pete Wyckoff [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121219131540.GA14207@padd.com \
--to=pw@padd.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).