From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Lars Schneider <larsxschneider@gmail.com>,
Vitor Antunes <vitor.hda@gmail.com>,
Sam Hocevar <sam@hocevar.net>, Luke Diamand <luke@diamand.org>
Subject: [PATCHv2 3/3] git-p4 tests: time_in_seconds should use $PYTHON_PATH
Date: Tue, 26 Apr 2016 08:51:01 +0100 [thread overview]
Message-ID: <1461657061-7984-4-git-send-email-luke@diamand.org> (raw)
In-Reply-To: <1461657061-7984-1-git-send-email-luke@diamand.org>
The time_in_seconds script should use $PYTHON_PATH, rather than
just hard-coded python, so that users can override which version
gets used, as is done for other python invocations.
Signed-off-by: Luke Diamand <luke@diamand.org>
---
t/lib-git-p4.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 7393ee2..012d40e 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -50,7 +50,7 @@ native_path() {
# at runtime (e.g. via NTP). The 'clock_gettime(CLOCK_MONOTONIC)'
# function could fix that but it is not in Python until 3.3.
time_in_seconds() {
- (cd / && python -c 'import time; print(int(time.time()))')
+ (cd / && "$PYTHON_PATH" -c 'import time; print(int(time.time()))')
}
# Try to pick a unique port: guess a large number, then hope
--
2.8.1.218.gd2cea43.dirty
prev parent reply other threads:[~2016-04-26 7:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 7:50 [PATCHv2 0/3] git-p4: support python3 in the tests Luke Diamand
2016-04-26 7:50 ` [PATCHv2 1/3] git-p4 tests: cd to / before running python Luke Diamand
2016-04-26 7:51 ` [PATCHv2 2/3] git-p4 tests: work with python3 as well as python2 Luke Diamand
2016-04-26 17:48 ` Junio C Hamano
2016-04-26 20:03 ` Luke Diamand
2016-04-26 7:51 ` Luke Diamand [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=1461657061-7984-4-git-send-email-luke@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
--cc=sam@hocevar.net \
--cc=vitor.hda@gmail.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).