From da9eba6e53b875498daab1991e99b797a8815700 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 11 Apr 2013 12:55:35 -0700 Subject: [PATCH] When running testr outside of venv use full path. * modules/jenkins/files/slave_scripts/run-tox.sh: When running testr from outside of the venv provide a full path to testr. Testr cannot be found otherwise. Change-Id: I25602847d389d4ddc62acd872e54727d6f309443 Reviewed-on: https://review.openstack.org/26783 Reviewed-by: Jeremy Stanley Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- modules/jenkins/files/slave_scripts/run-tox.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/run-tox.sh b/modules/jenkins/files/slave_scripts/run-tox.sh index eeb03f2168..7bff4a5c49 100755 --- a/modules/jenkins/files/slave_scripts/run-tox.sh +++ b/modules/jenkins/files/slave_scripts/run-tox.sh @@ -63,8 +63,8 @@ if [ -d ".testrepository" ] ; then gzip -9 ./subunit_log.txt gzip -9 ./testr_results.html - foundcount=$(.tox/$venv/bin/python testr list-tests | sed -e '1d' | wc -l) - rancount=$(.tox/$venv/bin/python testr last | sed -ne 's/Ran \([0-9]\+\).*tests in.*/\1/p') + 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') if [ "$rancount" -lt "$foundcount" ] ; then echo echo "The number of tests found was greater than the number of tests"