diff options
author | 2016-01-28 14:24:47 -0800 | |
---|---|---|
committer | 2016-01-28 14:39:54 -0800 | |
commit | fb018838590321a5e0635e0b499a33b31f71a0da (patch) | |
tree | 572ca6f66be48bbce78bd0b203b44fe3d5117524 /templates/tools/run_tests | |
parent | 610107cc3dced9fd39b24f9d6185e376b3375150 (diff) | |
parent | ddd91dbb42f6f52655738c6520548d04ea5f8468 (diff) |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'templates/tools/run_tests')
-rw-r--r-- | templates/tools/run_tests/configs.json.template | 17 | ||||
-rw-r--r-- | templates/tools/run_tests/sources_and_headers.json.template | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/templates/tools/run_tests/configs.json.template b/templates/tools/run_tests/configs.json.template new file mode 100644 index 0000000000..5c82dfb347 --- /dev/null +++ b/templates/tools/run_tests/configs.json.template @@ -0,0 +1,17 @@ +%YAML 1.2 +--- | + <% + import json + out_configs = [] + for name, args in configs.iteritems(): + config_args={} + config_args['config'] = name + if args.get('valgrind', None) is not None: + config_args['tool_prefix'] = ['valgrind'] + args.valgrind.split(' ') + if args.get('timeout_multiplier', 1) != 1: + config_args['timeout_multiplier'] = args.timeout_multiplier + if args.get('test_environ', None) is not None: + config_args['environ'] = args.test_environ + out_configs.append(config_args) + %>\ + ${json.dumps(out_configs, sort_keys=True, indent=2)} diff --git a/templates/tools/run_tests/sources_and_headers.json.template b/templates/tools/run_tests/sources_and_headers.json.template index 6ceb3731fb..78363ff1fa 100644 --- a/templates/tools/run_tests/sources_and_headers.json.template +++ b/templates/tools/run_tests/sources_and_headers.json.template @@ -39,5 +39,5 @@ proto_headers(tgt.src)), "deps": sorted(tgt.get('deps', []))} for tgt in (targets + libs) - if not tgt.boringssl], + if not tgt.boringssl and not tgt.zlib], sort_keys=True, indent=2)} |