aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar matt-kwong <matt-kwong@users.noreply.github.com>2017-03-12 22:15:54 -0700
committerGravatar GitHub <noreply@github.com>2017-03-12 22:15:54 -0700
commitfebb4c3c3ea3ed21275b2c6a911a1f213f96a776 (patch)
tree7148b3aaff8a7d19dd0c36c2411e3bf407491976 /tools
parent86ac76a0df3ad553f8a169ef58d7ae8598a7cdd2 (diff)
parent21e7dfc71269e9dcb4b9b5423e3c99c2bb0d16d7 (diff)
Merge pull request #10119 from nathanielmanistaatgoogle/fix-run_tests_matrix
run_tests_matrix: ignore the number of failed skipped tests
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run_tests/run_tests_matrix.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index 47422451f8..9607526920 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -415,8 +415,8 @@ if __name__ == "__main__":
maxjobs=args.jobs)
# Merge skipped tests into results to show skipped tests on report.xml
if skipped_jobs:
- skipped_results = jobset.run(skipped_jobs,
- skip_jobs=True)
+ ignored_num_skipped_failures, skipped_results = jobset.run(
+ skipped_jobs, skip_jobs=True)
resultset.update(skipped_results)
report_utils.render_junit_xml_report(resultset, 'report_%s' % _REPORT_SUFFIX,
suite_name='aggregate_tests')