From 456cbaee7655adfaae7f962ff611c7845fb4db4e Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 8 Feb 2016 14:45:45 -0800 Subject: Fixed node mac distrib tests --- tools/run_tests/distribtest_targets.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'tools/run_tests') diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py index b83cd16883..cc91e863fa 100644 --- a/tools/run_tests/distribtest_targets.py +++ b/tools/run_tests/distribtest_targets.py @@ -106,14 +106,15 @@ class NodeDistribTest(object): """Tests Node package""" def __init__(self, platform, arch, docker_suffix, node_version): - self.name = 'node_npm_%s_%s_%s_%s' % (platform, arch, - docker_suffix, node_version) + self.name = 'node_npm_%s_%s_%s' % (platform, arch, node_version) self.platform = platform self.arch = arch - self.docker_suffix = docker_suffix self.node_version = node_version self.labels = ['distribtest', 'node', platform, arch, docker_suffix, 'node-%s' % node_version] + if docker_suffix is not None: + self.name += '_%s' % docker_suffix + self.docker_suffix = docker_suffix def pre_build_jobspecs(self): return [] @@ -234,6 +235,11 @@ def targets(): RubyDistribTest('linux', 'x64', 'ubuntu1504'), RubyDistribTest('linux', 'x64', 'ubuntu1510'), RubyDistribTest('linux', 'x64', 'ubuntu1604'), + NodeDistribTest('macos', 'x64', None, '0.10'), + NodeDistribTest('macos', 'x64', None, '0.12'), + NodeDistribTest('macos', 'x64', None, '3'), + NodeDistribTest('macos', 'x64', None, '4'), + NodeDistribTest('macos', 'x64', None, '5'), NodeDistribTest('linux', 'x86', 'jessie', '4') ] + [ NodeDistribTest('linux', 'x64', os, version) -- cgit v1.2.3