diff options
author | murgatroid99 <mlumish@google.com> | 2017-04-24 13:35:21 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2017-04-24 13:35:21 -0700 |
commit | f94f64fc12d4bed8c1920f9ab0564503c7eff098 (patch) | |
tree | 544d9f67b4cd8792c65319be8fdf5d2bbfe2a565 /tools | |
parent | 59fe8e224620f6d7ef0f11d35a03cb7a362be176 (diff) |
Remove non-libuv code from Node extension
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/run_tests/helper_scripts/build_node.sh | 4 | ||||
-rwxr-xr-x | tools/run_tests/run_tests.py | 7 | ||||
-rwxr-xr-x | tools/run_tests/run_tests_matrix.py | 9 |
3 files changed, 2 insertions, 18 deletions
diff --git a/tools/run_tests/helper_scripts/build_node.sh b/tools/run_tests/helper_scripts/build_node.sh index 2c4cf02d8f..07ecf98396 100755 --- a/tools/run_tests/helper_scripts/build_node.sh +++ b/tools/run_tests/helper_scripts/build_node.sh @@ -46,6 +46,4 @@ case "$CONFIG" in *) config_flag='--release' ;; esac -uv_flag=$2 - -npm install --unsafe-perm --build-from-source $uv_flag $config_flag +npm install --unsafe-perm --build-from-source $config_flag diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 9130bc960a..883a5eef24 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -430,10 +430,6 @@ class NodeLanguage(object): _check_compiler(self.args.compiler, ['default', 'node0.12', 'node4', 'node5', 'node6', 'node7', 'electron1.3', 'electron1.6']) - if args.iomgr_platform == "uv": - self.use_uv = True - else: - self.use_uv = False if self.args.compiler == 'default': self.runtime = 'node' self.node_version = '7' @@ -490,8 +486,7 @@ class NodeLanguage(object): # building for electron requires a patch version self.node_version += '.0' return [['tools/run_tests/helper_scripts/{}.sh'.format(build_script), - self.node_version, - '--grpc_uv={}'.format('true' if self.use_uv else 'false')]] + self.node_version]] def post_tests_steps(self): return [] diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 1da754d9f8..c3c785936a 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -279,15 +279,6 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS) platforms=['linux'], arch='default', compiler='electron1.6', - iomgr_platform='uv', - labels=['portability'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - test_jobs += _generate_jobs(languages=['node'], - configs=['dbg'], - platforms=['linux'], - iomgr_platform='uv', labels=['portability'], extra_args=extra_args, inner_jobs=inner_jobs) |