From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2119) id 4576B3858C50; Fri, 29 Sep 2023 14:51:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4576B3858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1695999091; bh=nGG50NSQwgo4DaKNEvrpgn/j+u/qhu7+TRZ8gsCwHdM=; h=From:To:Subject:Date:From; b=V1k/xkpCAYED+5a2g+kxQMrsWafkalouBjr3IChDHBzMePOdzA7bK768IIh4NlrtF O9LgzhuEcdYvRG3wjXT04gOWv//eN3p8S2rn04xGzT4ISIIhCAe2wfj8OMDCC2QeiI lYzJOOi/XbAjFHGmPgE240vby9KRv1YnqgAvxh/Y= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jeff Law To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-4333] Harmonize headers between both dg-extract-results scripts X-Act-Checkin: gcc X-Git-Author: Paul Iannetta X-Git-Refname: refs/heads/master X-Git-Oldrev: e40f3301019a521b11bfcc25aeb1388e6da1ca2f X-Git-Newrev: 346f5991569faeb9995ac12100c2afba46ab6437 Message-Id: <20230929145131.4576B3858C50@sourceware.org> Date: Fri, 29 Sep 2023 14:51:31 +0000 (GMT) List-Id: https://gcc.gnu.org/g:346f5991569faeb9995ac12100c2afba46ab6437 commit r14-4333-g346f5991569faeb9995ac12100c2afba46ab6437 Author: Paul Iannetta Date: Fri Sep 29 08:50:28 2023 -0600 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. Diff: --- 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