diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-02 07:36:00 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-02 07:36:00 -0800 |
| commit | 97798aec73bb30b8a6dd563ac1cfb2991a5a786f (patch) | |
| tree | 109fa8b7876ad060ec13595696b1cc3180443a51 /tools/run_tests | |
| parent | 72784331ae1d37ff589e6873f30c33193f479f21 (diff) | |
| parent | a4ead5d91bcee35754531b8dcf2be45eadf65889 (diff) | |
Merge pull request #274 from nathanielmanistaatgoogle/python-introduction
Migrate the last of the Python code from Google-internal source control to git.
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/build_python.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_python.sh | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh index 6899ac7fe3..46e5797f62 100755 --- a/tools/run_tests/build_python.sh +++ b/tools/run_tests/build_python.sh @@ -8,3 +8,5 @@ cd $(dirname $0)/../.. root=`pwd` virtualenv python2.7_virtual_environment python2.7_virtual_environment/bin/pip install enum34==1.0.4 futures==2.2.0 +python2.7_virtual_environment/bin/pip install third_party/protobuf/python +python2.7_virtual_environment/bin/pip install src/python diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh index ef40602eb3..6e9405afb6 100755 --- a/tools/run_tests/run_python.sh +++ b/tools/run_tests/run_python.sh @@ -6,6 +6,19 @@ set -ex cd $(dirname $0)/../.. root=`pwd` -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) +# TODO(issue 215): Properly itemize these in run_tests.py so that they can be parallelized. +python2.7_virtual_environment/bin/python2.7 -B -m _adapter._blocking_invocation_inline_service_test +python2.7_virtual_environment/bin/python2.7 -B -m _adapter._c_test +python2.7_virtual_environment/bin/python2.7 -B -m _adapter._event_invocation_synchronous_event_service_test +python2.7_virtual_environment/bin/python2.7 -B -m _adapter._future_invocation_asynchronous_event_service_test +python2.7_virtual_environment/bin/python2.7 -B -m _adapter._links_test +python2.7_virtual_environment/bin/python2.7 -B -m _adapter._lonely_rear_link_test +python2.7_virtual_environment/bin/python2.7 -B -m _adapter._low_test +python2.7_virtual_environment/bin/python2.7 -B -m _framework.base.packets.implementations_test +python2.7_virtual_environment/bin/python2.7 -B -m _framework.face.blocking_invocation_inline_service_test +python2.7_virtual_environment/bin/python2.7 -B -m _framework.face.event_invocation_synchronous_event_service_test +python2.7_virtual_environment/bin/python2.7 -B -m _framework.face.future_invocation_asynchronous_event_service_test +python2.7_virtual_environment/bin/python2.7 -B -m _framework.foundation._later_test +python2.7_virtual_environment/bin/python2.7 -B -m _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' |