From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2016 21:45:42 +0000 (-0700)
Subject: Merge branch 'ld/p4-test-py3'
X-Git-Tag: v2.9.0-rc0~70
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ca158f4633e40fb8a6e7e6b78dc7ad559718a19b

Merge branch 'ld/p4-test-py3'

The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.

* ld/p4-test-py3:
git-p4 tests: time_in_seconds should use $PYTHON_PATH
git-p4 tests: work with python3 as well as python2
git-p4 tests: cd to / before running python
---

ca158f4633e40fb8a6e7e6b78dc7ad559718a19b
diff --cc t/lib-git-p4.sh
index ce3536e4a0,012d40e746..54fd5a6ca0
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@@ -49,8 -49,8 +49,8 @@@ native_path () 
  # Attention: This function is not safe again against time offset updates
  # 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() {
 +time_in_seconds () {
- 	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