Hi,
This is a small patch so that both dg-extract-results.py and
dg-extract-results.sh share the same header. In particular, it fixes
the fact that the regexp r'^Test Run By (\S+) on (.*)$' was never
matched in the python file.
Thanks,
--
Paul
Kalray
Author: Paul Iannetta <pianne...@kalrayinc.com>
Date: Thu Sep 14 15:43:58 2023 +0200
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:
2023-09-14 Paul Iannetta <pianne...@kalrayinc.com>
* 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 30aa68771d4..34da1808c5f 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 ff6c50d029c..57f6fe0e997 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
