This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH, contrib] Support multi-tool sum files in dg-cmp-results.sh


Forgetting the patch: check!
Sending it later as a reply to the wrong message: check!

Hopefully I won't check a second time any of those.

Best regards,

Thomas

On 14/06/17 13:30, Thomas Preudhomme wrote:
Hi,

dg-cmp-results.sh contrib script is written to work with sum file for
a single tool only. It throws away the header including the first ===
line and everything starting from the following ===, assuming it is the
test result. This does not work well for sum files with results for
multiple tools.

This patch changes the logic to instead keep everything between "Running
target" line and the beginning of Summary line. Other existing filter
mechanism will ensure only FAIL, PASS, etc. lines are kept after that.

ChangeLog entry is as follow:

*** contrib/ChangeLog ***

2017-06-14  Thomas Preud'homme  <thomas.preudhomme@arm.com>

    * dg-cmp-results.sh: Keep test result lines rather than throwing
    header and summary to support sum files with multiple tools.

Tested successfully on sum file with single tool with similar results
and on sum file with multiple tools now showing a regression with patch
proposed in https://gcc.gnu.org/ml/gcc-patches/2017-06/msg00875.html

Is this ok for trunk?

Best regards,

Thomas
diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh
index d291769547dcd2a02ecf6f80d60d6be7802af4fd..d875b4bd8bca16c1f381355612ef34f6879c5674 100755
--- a/contrib/dg-cmp-results.sh
+++ b/contrib/dg-cmp-results.sh
@@ -91,8 +91,7 @@ sed $E -e '/^[[:space:]]+===/,$d' $NFILE
 
 # Create a temporary file from the old file's interesting section.
 sed $E -e "1,/$header/d" \
-  -e '/^[[:space:]]+===/,$d' \
-  -e '/^[A-Z]+:/!d' \
+  -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \
   -e '/^(WARNING|ERROR):/d' \
   -e 's/\r$//' \
   -e 's/^/O:/' \
@@ -102,8 +101,7 @@ sed $E -e "1,/$header/d" \
 
 # Create a temporary file from the new file's interesting section.
 sed $E -e "1,/$header/d" \
-  -e '/^[[:space:]]+===/,$d' \
-  -e '/^[A-Z]+:/!d' \
+  -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \
   -e '/^(WARNING|ERROR):/d' \
   -e 's/\r$//' \
   -e 's/^/N:/' \

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]