aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/distribtest_targets.py
diff options
context:
space:
mode:
authorGravatar murgatroid99 <mlumish@google.com>2016-02-08 13:09:21 -0800
committerGravatar murgatroid99 <mlumish@google.com>2016-02-10 10:26:49 -0800
commit09727630b1c7a8240ce5c91f219b59b8a6a3dd73 (patch)
tree40a5cd04ec3fff0fa20eb4ed3a4da09791322922 /tools/run_tests/distribtest_targets.py
parenta8ba0c56158eca15cca58725a49a0ceb7e68e795 (diff)
Enable Node distrib tests on Mac
Diffstat (limited to 'tools/run_tests/distribtest_targets.py')
-rw-r--r--tools/run_tests/distribtest_targets.py22
1 files changed, 14 insertions, 8 deletions
diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py
index fc7dd17145..b83cd16883 100644
--- a/tools/run_tests/distribtest_targets.py
+++ b/tools/run_tests/distribtest_targets.py
@@ -119,15 +119,21 @@ class NodeDistribTest(object):
return []
def build_jobspec(self):
- if self.platform not in ('linux',):
+ if self.platform == 'linux':
+ return create_docker_jobspec(self.name,
+ 'tools/dockerfile/distribtest/node_%s_%s' % (
+ self.docker_suffix,
+ self.arch),
+ 'test/distrib/node/run_distrib_test.sh %s' % (
+ self.node_version))
+ elif self.platform == 'macos':
+ return create_jobspec(self.name,
+ ['test/distrib/node/run_distrib_test.sh',
+ str(self.node_version)],
+ environ={'EXTERNAL_GIT_ROOT': '../../..'})
+ else:
raise Exception("Not supported yet.")
- return create_docker_jobspec(self.name,
- 'tools/dockerfile/distribtest/node_%s_%s' % (
- self.docker_suffix,
- self.arch),
- 'test/distrib/node/run_distrib_test.sh %s' % (
- self.node_version))
def __str__(self):
return self.name
@@ -232,6 +238,6 @@ def targets():
] + [
NodeDistribTest('linux', 'x64', os, version)
for os in ('wheezy', 'jessie', 'ubuntu1204', 'ubuntu1404',
- 'ubuntu1504', 'ubuntu1510', 'ubuntu1604')
+ 'ubuntu1504', 'ubuntu1510', 'ubuntu1604', 'macos')
for version in ('0.10', '0.12', '3', '4', '5')
]