14965: Run py3 tests in the python3 virtualenv.
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 9 Jul 2019 14:49:44 +0000 (10:49 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 9 Jul 2019 14:49:44 +0000 (10:49 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

build/run-tests.sh

index 79c531b29b7cb65c69b11fd2f625c702e64c8dd4..ec4fec918d6278811b8a2dfdd001d44bd216d25a 100755 (executable)
@@ -794,7 +794,10 @@ do_test_once() {
             tries=$((${tries}+1))
             # $3 can name a path directory for us to use, including trailing
             # slash; e.g., the bin/ subdirectory of a virtualenv.
-            "${3}python" setup.py ${short:+--short-tests-only} test ${testargs[$1]}
+            if [[ -e "${3}activate" ]]; then
+                . "${3}activate"
+            fi
+            python setup.py ${short:+--short-tests-only} test ${testargs[$1]}
             result=$?
             if [[ ${tries} < 3 && ${result} == 137 ]]
             then