aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-01-23 21:48:42 -0800
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-01-23 21:48:42 -0800
commite2380338bfc9cec2f44877b3551d4e94490c1daa (patch)
tree52a464f9d3b64fe756098c5368f3ae426e24e466 /tools
parentcacae338b6cf32b8deedc26141990da78bd03034 (diff)
parent7a3c38bed9ea9e69ec748b9ed08cdf16cb6ac501 (diff)
Merge pull request #193 from nathanielmanistaatgoogle/python-introduction
Bring the rest of Python RPC Framework into GRPC.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run_tests/run_python.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh
index 0d5ed0238d..ef40602eb3 100755
--- a/tools/run_tests/run_python.sh
+++ b/tools/run_tests/run_python.sh
@@ -6,5 +6,6 @@ set -ex
cd $(dirname $0)/../..
root=`pwd`
-python2.7_virtual_environment/bin/python2.7 -B -m unittest discover -s src/python -p '*.py'
-python3.4 -B -m unittest discover -s src/python -p '*.py'
+PYTHONPATH=third_party/protobuf/python python2.7_virtual_environment/bin/python2.7 -B -m unittest discover -s src/python -p '*.py'
+# TODO(nathaniel): Get this working again (requires 3.X-friendly protobuf)
+# python3.4 -B -m unittest discover -s src/python -p '*.py'