aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/run_tests.py
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-04-20 19:24:41 +0000
committerGravatar Craig Tiller <ctiller@google.com>2017-04-20 19:24:41 +0000
commit3df4584b9c1ab0425205bdef486a4744f6ec7d73 (patch)
tree1fcebf342c33df2847c68167608b7eabb77e540b /tools/run_tests/run_tests.py
parent227e11bdee93bcc88abf664be23aab8cafbaf653 (diff)
parent14ff003ae48f6bafe379e7590573834bc563a7cb (diff)
Merge github.com:grpc/grpc into epex4
Diffstat (limited to 'tools/run_tests/run_tests.py')
-rwxr-xr-xtools/run_tests/run_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 105797cfb2..43c84d7883 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -429,7 +429,7 @@ class NodeLanguage(object):
# we should specify in the compiler argument
_check_compiler(self.args.compiler, ['default', 'node0.12',
'node4', 'node5', 'node6',
- 'node7', 'electron1.3'])
+ 'node7', 'electron1.3', 'electron1.6'])
if args.iomgr_platform == "uv":
self.use_uv = True
else:
@@ -1178,7 +1178,7 @@ argp.add_argument('--compiler',
'vs2013', 'vs2015',
'python2.7', 'python3.4', 'python3.5', 'python3.6', 'pypy', 'pypy3', 'python_alpine',
'node0.12', 'node4', 'node5', 'node6', 'node7',
- 'electron1.3',
+ 'electron1.3', 'electron1.6',
'coreclr',
'cmake'],
default='default',