[gcc r14-1818] [contrib] validate_failures.py: Support "$tool:" prefix in exp names

[Maxim Kuvyrkov]

https://gcc.gnu.org/g:484a48640c4619b3ce0c44e5acef78729f34972d

commit r14-1818-g484a48640c4619b3ce0c44e5acef78729f34972d
Author: Christophe Lyon <christophe.lyon@linaro.org>
Date:   Thu Jun 1 12:00:48 2023 +0000

    [contrib] validate_failures.py: Support "$tool:" prefix in exp names
    
    This makes it easier to extract the $tool:$exp pair when iterating
    over failures/flaky tests, which, in turn, simplifies re-running
    testsuite parts that have unexpected failures or passes.
    
    contrib/ChangeLog:
    
            * testsuite-management/validate_failures.py (_EXP_LINE_FORMAT,)
            (_EXP_LINE_REX, ResultSet): Support "$tool:" prefix in exp names.

Diff:
---
 contrib/testsuite-management/validate_failures.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contrib/testsuite-management/validate_failures.py b/contrib/testsuite-management/validate_failures.py
index c4b9fc377ce..6dcdcf5c69b 100755
--- a/contrib/testsuite-management/validate_failures.py
+++ b/contrib/testsuite-management/validate_failures.py
@@ -67,12 +67,14 @@ _VALID_TEST_RESULTS_REX = re.compile('(%s):\s*(\S+)\s*(.*)'
 
 # Formats of .sum file sections
 _TOOL_LINE_FORMAT = '\t\t=== %s tests ===\n'
-_EXP_LINE_FORMAT = '\nRunning %s ...\n'
+_EXP_LINE_FORMAT = '\nRunning %s:%s ...\n'
 _SUMMARY_LINE_FORMAT = '\n\t\t=== %s Summary ===\n'
 
 # ... and their compiled regexs.
 _TOOL_LINE_REX = re.compile('^\t\t=== (.*) tests ===\n')
-_EXP_LINE_REX = re.compile('^Running (.*\.exp) \.\.\.\n')
+# Match .exp file name, optionally prefixed by a "tool:" name and a
+# path ending with "testsuite/"
+_EXP_LINE_REX = re.compile('^Running (?:.*:)?(.*) \.\.\.\n')
 _SUMMARY_LINE_REX = re.compile('^\t\t=== (.*) Summary ===\n')
 
 # Subdirectory of srcdir in which to find the manifest file.
@@ -236,7 +238,7 @@ class ResultSet(set):
         outfile.write(_TOOL_LINE_FORMAT % current_tool)
       if current_exp != result.exp:
         current_exp = result.exp
-        outfile.write(_EXP_LINE_FORMAT % current_exp)
+        outfile.write(_EXP_LINE_FORMAT % (current_tool, current_exp))
       outfile.write('%s\n' % result)
 
     outfile.write(_SUMMARY_LINE_FORMAT % 'Results')