diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-05 16:07:18 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-05 16:07:18 -0800 |
| commit | 6b5555ead1a0a7141d28bec505f5421a4101763d (patch) | |
| tree | 83e759cac2bc9145e0adb4f7cdb10e0f9bba8d2f /test | |
| parent | a7f3e057605586eec0c496c5c600146289703926 (diff) | |
Fix docker files, distrib test script
Diffstat (limited to 'test')
| -rwxr-xr-x | test/distrib/python/run_distrib_test.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/test/distrib/python/run_distrib_test.sh b/test/distrib/python/run_distrib_test.sh index 2148be121a..08856ad388 100755 --- a/test/distrib/python/run_distrib_test.sh +++ b/test/distrib/python/run_distrib_test.sh @@ -42,16 +42,17 @@ then exit 1 fi -# TODO(jtattermusch): this shouldn't be required -pip install --upgrade six +PIP=pip2 +which $PIP || PIP=pip +PYTHON=python2 +which $PYTHON || PYTHON=python -# TODO(jtattermusch): if these don't get preinstalled, pip tries to install them -# with --use-grpc-custom-bdist option, which obviously fails. -pip install --upgrade enum34 -pip install --upgrade futures +# TODO(jtattermusch): this shouldn't be required +$PIP install --upgrade six GRPC_PYTHON_BINARIES_REPOSITORY="${BDIST_DIR}" \ - pip install \ + $PIP install \ "${SDIST_ARCHIVE}" -python distribtest.py +$PYTHON distribtest.py + |