|
|
@ -182,9 +182,9 @@ def get_c_tests(travis, test_lang): |
|
|
|
with open('tools/run_tests/generated/tests.json') as f: |
|
|
|
with open('tools/run_tests/generated/tests.json') as f: |
|
|
|
js = json.load(f) |
|
|
|
js = json.load(f) |
|
|
|
return [ |
|
|
|
return [ |
|
|
|
tgt for tgt in js if tgt['language'] == test_lang and |
|
|
|
tgt for tgt in js |
|
|
|
platform_string() in tgt[platforms_str] and |
|
|
|
if tgt['language'] == test_lang and platform_string() in |
|
|
|
not (travis and tgt['flaky']) |
|
|
|
tgt[platforms_str] and not (travis and tgt['flaky']) |
|
|
|
] |
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1637,7 +1637,8 @@ if any(language.make_options() for language in languages): |
|
|
|
# together, and is only used under gcov. All other configs should build languages individually. |
|
|
|
# together, and is only used under gcov. All other configs should build languages individually. |
|
|
|
language_make_options = list( |
|
|
|
language_make_options = list( |
|
|
|
set([ |
|
|
|
set([ |
|
|
|
make_option for lang in languages |
|
|
|
make_option |
|
|
|
|
|
|
|
for lang in languages |
|
|
|
for make_option in lang.make_options() |
|
|
|
for make_option in lang.make_options() |
|
|
|
])) |
|
|
|
])) |
|
|
|
|
|
|
|
|
|
|
|