diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-07-13 12:42:57 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-13 12:42:57 -0700 |
| commit | 377427a7bd0b5bbf9270357737ab8b42e94e1f1b (patch) | |
| tree | 93e567976896333d97eae9f8c3ce2aab9dbe2481 /tools | |
| parent | 6ee6a54820bcd4a4786b3cdac4d8c705b49f53d0 (diff) | |
| parent | 9195ea0f2a65e1103f23cd510181a3f654fe9215 (diff) | |
Merge pull request #7357 from grpc/v1.0.x
Automatic v1.0.x -> master upmerge
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/distrib/python/docgen.py | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/distrib/python/docgen.py b/tools/distrib/python/docgen.py index 72c65ad14a..f5e89f1da6 100755 --- a/tools/distrib/python/docgen.py +++ b/tools/distrib/python/docgen.py @@ -70,7 +70,6 @@ environment.update({ }) subprocess_arguments_list = [ - {'args': ['make'], 'cwd': PROJECT_ROOT}, {'args': ['virtualenv', VIRTUALENV_DIR], 'env': environment}, {'args': [VIRTUALENV_PIP_PATH, 'install', '-r', REQUIREMENTS_PATH], 'env': environment}, diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index f081887fc0..95d53e5f9e 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -662,7 +662,7 @@ class ObjCLanguage(object): return [] def make_targets(self): - return ['grpc_objective_c_plugin', 'interop_server'] + return ['interop_server'] def make_options(self): return [] |