diff options
| author |  Ken Payson <kpayson@google.com> | 2016-04-20 09:42:19 -0700 |
|---|---|---|
| committer | Ken Payson <kpayson@google.com> | 2016-04-26 13:56:17 -0700 |
| commit | 707c9e29e08f1db8f27253c1951ff62b55561e13 (patch) | |
| tree | b6dded80a9fbb710ee70684ee1df085597bd8407 /tools | |
| parent | 17735908ed4eb1c54bd1b3652062b49f58a985e3 (diff) | |
Changed python proto build to use shared protos
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/run_interop_tests.py | 3 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 28b91f8b62..fb2be22944 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -314,7 +314,8 @@ class PythonLanguage: ] def global_env(self): - return {'LD_LIBRARY_PATH': '{}/libs/opt'.format(DOCKER_WORKDIR_ROOT)} + return {'LD_LIBRARY_PATH': '{}/libs/opt'.format(DOCKER_WORKDIR_ROOT), + 'PYTHONPATH': '{}/src/python/gens'.format(DOCKER_WORKDIR_ROOT)} def unimplemented_test_cases(self): return _SKIP_ADVANCED + _SKIP_COMPRESSION + ['jwt_token_creds', diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 9dff686bbf..4b9898539d 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -371,6 +371,7 @@ class PythonLanguage(object): tests_json = json.load(tests_json_file) environment = dict(_FORCE_ENVIRON_FOR_WRAPPERS) environment['PYVER'] = '2.7' + environment['PYTHONPATH'] = os.path.abspath('src/python/gens') if self.config.build_config != 'gcov': return [self.config.job_spec( ['tools/run_tests/run_python.sh'], |