From 41d220eb4f3427ddd9865a19ee6ab2c01c8ef5ea Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 22 Jan 2018 17:02:44 +0100 Subject: [PATCH] make c++ reports display correctly in resultstore --- tools/run_tests/run_tests_matrix.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 344035478b5..ae3a28bde53 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -44,14 +44,19 @@ _DEFAULT_INNER_JOBS = 2 _REPORT_SUFFIX = 'sponge_log.xml' +def _safe_report_name(name): + """Reports with '+' in target name won't show correctly in ResultStore""" + return name.replace('+', 'p') + + def _report_filename(name): """Generates report file name""" - return 'report_%s_%s' % (name, _REPORT_SUFFIX) + return 'report_%s_%s' % (_safe_report_name(name), _REPORT_SUFFIX) def _report_filename_internal_ci(name): """Generates report file name that leads to better presentation by internal CI""" - return '%s/%s' % (name, _REPORT_SUFFIX) + return '%s/%s' % (_safe_report_name(name), _REPORT_SUFFIX) def _docker_jobspec(name, @@ -68,7 +73,7 @@ def _docker_jobspec(name, '-j', str(inner_jobs), '-x', _report_filename(name), '--report_suite_name', - '%s' % name + '%s' % _safe_report_name(name) ] + runtests_args, environ=runtests_envs, shortname='run_tests_%s' % name, @@ -95,7 +100,7 @@ def _workspace_jobspec(name, '-t', '-j', str(inner_jobs), '-x', '../%s' % _report_filename(name), '--report_suite_name', - '%s' % name + '%s' % _safe_report_name(name) ] + runtests_args, environ=env, shortname='run_tests_%s' % name,