From 346f5991569faeb9995ac12100c2afba46ab6437 Mon Sep 17 00:00:00 2001 From: Paul Iannetta Date: Fri, 29 Sep 2023 08:50:28 -0600 Subject: [PATCH] Harmonize headers between both dg-extract-results scripts The header of the python version looked like: Target is ... Host is ... The header of the bash version looked like: Test run by ... on ... Target is ... After this change both headers look like: Test run by ... on ... Target is ... Host is ... The order of the tests is not the same but since dg-cmp-results.sh it does not matter much. contrib/ChangeLog: * dg-extract-results.py: Print the "Test run" line. * dg-extract-results.sh: Print the "Host" line. --- contrib/dg-extract-results.py | 2 +- contrib/dg-extract-results.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index 7c2eb48fcd0..0bc65d30eaf 100644 --- a/contrib/dg-extract-results.py +++ b/contrib/dg-extract-results.py @@ -113,7 +113,7 @@ class Prog: # Whether to create .sum rather than .log output. self.do_sum = True # Regexps used while parsing. - self.test_run_re = re.compile (r'^Test Run By (\S+) on (.*)$') + self.test_run_re = re.compile (r'^Test run by (\S+) on (.*)$') self.tool_re = re.compile (r'^\t\t=== (.*) tests ===$') self.result_re = re.compile (r'^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED' r'|WARNING|ERROR|UNSUPPORTED|UNTESTED' diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index 33968ed7b23..2a25d2c81db 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -271,7 +271,7 @@ cat $SUM_FILES \ # Write the begining of the combined summary file. -head -n 2 $FIRST_SUM +head -n 3 $FIRST_SUM echo echo " === $TOOL tests ===" echo