Allow restricting platforms for certain tests

pull/1232/head
Craig Tiller 10 years ago
parent 95cd750989
commit d625d81e9b
  1. 3
      build.json
  2. 1
      templates/tools/run_tests/tests.json.template
  3. 12
      tools/run_tests/run_tests.py
  4. 2531
      tools/run_tests/tests.json

@ -854,6 +854,9 @@
"grpc", "grpc",
"gpr_test_util", "gpr_test_util",
"gpr" "gpr"
],
"platforms": [
"posix"
] ]
}, },
{ {

@ -4,6 +4,7 @@ import json
${json.dumps([{"name": tgt.name, ${json.dumps([{"name": tgt.name,
"language": tgt.language, "language": tgt.language,
"platforms": tgt.get("platforms", ["windows", "posix"]),
"flaky": tgt.get("flaky", False)} "flaky": tgt.get("flaky", False)}
for tgt in targets for tgt in targets
if tgt.get('run', True) and tgt.build == 'test'], if tgt.get('run', True) and tgt.build == 'test'],

@ -102,9 +102,16 @@ class CLanguage(object):
def __init__(self, make_target, test_lang): def __init__(self, make_target, test_lang):
self.make_target = make_target self.make_target = make_target
if platform.system() == 'Windows':
plat = 'windows'
else:
plat = 'posix'
with open('tools/run_tests/tests.json') as f: with open('tools/run_tests/tests.json') as f:
js = json.load(f) js = json.load(f)
self.binaries = [tgt for tgt in js if tgt['language'] == test_lang] self.binaries = [tgt
for tgt in js
if tgt['language'] == test_lang and
plat in tgt['platforms']]
def test_specs(self, config, travis): def test_specs(self, config, travis):
out = [] out = []
@ -191,6 +198,7 @@ class PythonLanguage(object):
def __str__(self): def __str__(self):
return 'python' return 'python'
class RubyLanguage(object): class RubyLanguage(object):
def test_specs(self, config, travis): def test_specs(self, config, travis):
@ -208,6 +216,7 @@ class RubyLanguage(object):
def __str__(self): def __str__(self):
return 'ruby' return 'ruby'
class CSharpLanguage(object): class CSharpLanguage(object):
def test_specs(self, config, travis): def test_specs(self, config, travis):
@ -225,6 +234,7 @@ class CSharpLanguage(object):
def __str__(self): def __str__(self):
return 'csharp' return 'csharp'
class Build(object): class Build(object):
def test_specs(self, config, travis): def test_specs(self, config, travis):

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save