aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-09-01 06:48:55 -0700
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-09-01 06:48:55 -0700
commitbd4e378445395bc752139e190bc21fd3b5182a11 (patch)
tree32d1416e50a61008d4128b6cdb4b3c0b9b7178db
parentd5904820aa3388961284b1b23d94e9c9a5fbcdc9 (diff)
Windows tweak
-rwxr-xr-xtools/run_tests/run_tests.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 20abc7df1a..8e7dd06cad 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -455,7 +455,6 @@ build_configs = set(cfg.build_config for cfg in run_configs)
if args.travis:
_FORCE_ENVIRON_FOR_WRAPPERS = {'GRPC_TRACE': 'surface,batch'}
-make_targets = []
languages = set(_LANGUAGES[l]
for l in itertools.chain.from_iterable(
_LANGUAGES.iterkeys() if x == 'all' else [x]
@@ -481,10 +480,12 @@ else:
'CONFIG=%s' % cfg] + targets,
timeout_seconds=30*60)
-build_steps = [make_jobspec(cfg,
- list(set(itertools.chain.from_iterable(
- l.make_targets() for l in languages))))
- for cfg in build_configs]
+make_targets = list(set(itertools.chain.from_iterable(
+ l.make_targets() for l in languages)))
+build_steps = []
+if make_targets:
+ build_steps.extend(set(make_jobspec(cfg, make_targets)
+ for cfg in build_configs))
build_steps.extend(set(
jobset.JobSpec(cmdline, environ={'CONFIG': cfg})
for cfg in build_configs