From 983ca1106cccf27d03ae44f87f4f860e0fca3f0f Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 31 Jul 2013 20:54:46 +0000
Subject: [PATCH] Pass testr and subunit2html.py a PYTHON envvar.

* modules/jenkins/files/slave_scripts/run-tox.sh: Some subprocesses
of testr get invoked from the calling environment's configured
interpreter regardless of what interpreter was used to invoke the
parent process. Put that in a PYTHON envvar instead of on the
command line.

* modules/jenkins/files/slave_scripts/subunit2html.py: Fix this
script to invoke the interpreter specified by the calling
environment instead of using an explicit executable path in its
shebang.

Change-Id: Id27e4a280e88b2ce386af6e9f248b1c4e004583a
---
 modules/jenkins/files/slave_scripts/run-tox.sh      | 7 ++++---
 modules/jenkins/files/slave_scripts/subunit2html.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/jenkins/files/slave_scripts/run-tox.sh b/modules/jenkins/files/slave_scripts/run-tox.sh
index b9df7a2f60..faee75826d 100755
--- a/modules/jenkins/files/slave_scripts/run-tox.sh
+++ b/modules/jenkins/files/slave_scripts/run-tox.sh
@@ -59,13 +59,14 @@ if [ -d ".testrepository" ] ; then
     elif [ -f ".testrepository/0" ] ; then
         cp .testrepository/0 ./subunit_log.txt
     fi
-    .tox/$venv/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py ./subunit_log.txt testr_results.html
+    export PYTHON=.tox/$venv/bin/python
+    /usr/local/jenkins/slave_scripts/subunit2html.py ./subunit_log.txt testr_results.html
     gzip -9 ./subunit_log.txt
     gzip -9 ./testr_results.html
 
     set -e
-    foundcount=$(.tox/$venv/bin/python .tox/$venv/bin/testr list-tests | sed -e '1d' | wc -l)
-    rancount=$(.tox/$venv/bin/python .tox/$venv/bin/testr last | sed -ne 's/Ran \([0-9]\+\).*tests in.*/\1/p')
+    foundcount=$(.tox/$venv/bin/testr list-tests | sed -e '1d' | wc -l)
+    rancount=$(.tox/$venv/bin/testr last | sed -ne 's/Ran \([0-9]\+\).*tests in.*/\1/p')
     if [ "$rancount" -lt "$foundcount" ] ; then
         echo
         echo "The number of tests found was greater than the number of tests"
diff --git a/modules/jenkins/files/slave_scripts/subunit2html.py b/modules/jenkins/files/slave_scripts/subunit2html.py
index 9e5660e0d7..4cfdc9c59e 100755
--- a/modules/jenkins/files/slave_scripts/subunit2html.py
+++ b/modules/jenkins/files/slave_scripts/subunit2html.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 """
 Utility to convert a subunit stream to an html results file.
 Code is adapted from the pyunit Html test runner at