From a0f85171d1efd1bd0c159c6940f34880c247596e Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 20 Jan 2016 15:56:06 -0800 Subject: Move build configs into build.yaml Importantly: - allows matching timeout values between makefile and run_tests without repeating ourselves - allows borrowing of compiler flags by other build systems There's still a little too much build configuration built into our Makefile, but we can start attacking that over time. --- templates/tools/run_tests/configs.json.template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 templates/tools/run_tests/configs.json.template (limited to 'templates/tools/run_tests') 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)} -- cgit v1.2.3 From ce62feb37059eca26b607deb0b9974bce148cc64 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 21 Jan 2016 14:22:46 -0800 Subject: Fix sanity --- .../run_tests/sources_and_headers.json.template | 2 +- tools/run_tests/sources_and_headers.json | 46 ---------------------- 2 files changed, 1 insertion(+), 47 deletions(-) (limited to 'templates/tools/run_tests') diff --git a/templates/tools/run_tests/sources_and_headers.json.template b/templates/tools/run_tests/sources_and_headers.json.template index ba1c5a5ef8..04802772af 100644 --- a/templates/tools/run_tests/sources_and_headers.json.template +++ b/templates/tools/run_tests/sources_and_headers.json.template @@ -32,5 +32,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)} diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index bdb917d93c..8d3785b586 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -4335,52 +4335,6 @@ "src/csharp/ext/grpc_csharp_ext.c" ] }, - { - "deps": [], - "headers": [ - "third_party/zlib/crc32.h", - "third_party/zlib/deflate.h", - "third_party/zlib/gzguts.h", - "third_party/zlib/inffast.h", - "third_party/zlib/inffixed.h", - "third_party/zlib/inflate.h", - "third_party/zlib/inftrees.h", - "third_party/zlib/trees.h", - "third_party/zlib/zconf.h", - "third_party/zlib/zlib.h", - "third_party/zlib/zutil.h" - ], - "language": "c", - "name": "z", - "src": [ - "third_party/zlib/adler32.c", - "third_party/zlib/compress.c", - "third_party/zlib/crc32.c", - "third_party/zlib/crc32.h", - "third_party/zlib/deflate.c", - "third_party/zlib/deflate.h", - "third_party/zlib/gzclose.c", - "third_party/zlib/gzguts.h", - "third_party/zlib/gzlib.c", - "third_party/zlib/gzread.c", - "third_party/zlib/gzwrite.c", - "third_party/zlib/infback.c", - "third_party/zlib/inffast.c", - "third_party/zlib/inffast.h", - "third_party/zlib/inffixed.h", - "third_party/zlib/inflate.c", - "third_party/zlib/inflate.h", - "third_party/zlib/inftrees.c", - "third_party/zlib/inftrees.h", - "third_party/zlib/trees.c", - "third_party/zlib/trees.h", - "third_party/zlib/uncompr.c", - "third_party/zlib/zconf.h", - "third_party/zlib/zlib.h", - "third_party/zlib/zutil.c", - "third_party/zlib/zutil.h" - ] - }, { "deps": [ "gpr", -- cgit v1.2.3