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 --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py
index 7c2eb48fcd04242aed132e0536335f87725bcfc1..0bc65d30eaf6dd57056af2221757ffd79730afbb 100644 (file)
--- 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 33968ed7b236bc063c3b87e8ab6c9e977a8b7f2a..2a25d2c81db8b93a71890435bab5ef324f98ab77 100755 (executable)
--- 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