diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-17 20:28:40 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-17 20:28:40 -0800 |
| commit | 347b83c22288a20ae977f949ab8cd466e8aa52da (patch) | |
| tree | 6b66bf0996c697e72e2a61fcc5885df0f3ef092a /tools/run_tests/run_python.sh | |
| parent | f222a4afe96381cc9289af1859a4e28b2d7f54f0 (diff) | |
| parent | 560292ab6720aebe6fd40cc1f96e28faa92761d7 (diff) | |
Merge github.com:grpc/grpc into copyright
Conflicts:
src/python/src/__init__.py
src/python/src/_adapter/__init__.py
src/python/src/_framework/__init__.py
src/python/src/_framework/base/__init__.py
src/python/src/_framework/base/packets/__init__.py
src/python/src/_framework/common/__init__.py
src/python/src/_framework/face/__init__.py
src/python/src/_framework/face/testing/__init__.py
src/python/src/_framework/foundation/__init__.py
src/python/src/_junkdrawer/__init__.py
Diffstat (limited to 'tools/run_tests/run_python.sh')
| -rwxr-xr-x | tools/run_tests/run_python.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh index 73b0bd1a12..fc7e487118 100755 --- a/tools/run_tests/run_python.sh +++ b/tools/run_tests/run_python.sh @@ -37,18 +37,18 @@ root=`pwd` export LD_LIBRARY_PATH=$root/libs/opt source python2.7_virtual_environment/bin/activate # TODO(issue 215): Properly itemize these in run_tests.py so that they can be parallelized. -python2.7 -B -m _adapter._blocking_invocation_inline_service_test -python2.7 -B -m _adapter._c_test -python2.7 -B -m _adapter._event_invocation_synchronous_event_service_test -python2.7 -B -m _adapter._future_invocation_asynchronous_event_service_test -python2.7 -B -m _adapter._links_test -python2.7 -B -m _adapter._lonely_rear_link_test -python2.7 -B -m _adapter._low_test -python2.7 -B -m _framework.base.packets.implementations_test -python2.7 -B -m _framework.face.blocking_invocation_inline_service_test -python2.7 -B -m _framework.face.event_invocation_synchronous_event_service_test -python2.7 -B -m _framework.face.future_invocation_asynchronous_event_service_test -python2.7 -B -m _framework.foundation._later_test -python2.7 -B -m _framework.foundation._logging_pool_test +python2.7 -B -m grpc._adapter._blocking_invocation_inline_service_test +python2.7 -B -m grpc._adapter._c_test +python2.7 -B -m grpc._adapter._event_invocation_synchronous_event_service_test +python2.7 -B -m grpc._adapter._future_invocation_asynchronous_event_service_test +python2.7 -B -m grpc._adapter._links_test +python2.7 -B -m grpc._adapter._lonely_rear_link_test +python2.7 -B -m grpc._adapter._low_test +python2.7 -B -m grpc.framework.base.packets.implementations_test +python2.7 -B -m grpc.framework.face.blocking_invocation_inline_service_test +python2.7 -B -m grpc.framework.face.event_invocation_synchronous_event_service_test +python2.7 -B -m grpc.framework.face.future_invocation_asynchronous_event_service_test +python2.7 -B -m grpc.framework.foundation._later_test +python2.7 -B -m grpc.framework.foundation._logging_pool_test # TODO(nathaniel): Get tests working under 3.4 (requires 3.X-friendly protobuf) # python3.4 -B -m unittest discover -s src/python -p '*.py' |