Support multi-tool sum files in dg-cmp-results.sh

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

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

From-SVN: r249422
This commit is contained in:
Thomas Preud'homme 2017-06-20 16:52:53 +00:00 committed by Thomas Preud'homme
parent d276da0cf5
commit afc474f8ca
2 changed files with 7 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2017-06-20 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.
2017-05-31 Martin Liska <mliska@suse.cz> 2017-05-31 Martin Liska <mliska@suse.cz>
* filter_params.py: * filter_params.py:

View File

@ -90,8 +90,7 @@ echo "Newer log file: $NFILE"
sed $E -e '/^[[:space:]]+===/,$d' $NFILE sed $E -e '/^[[:space:]]+===/,$d' $NFILE
# Create a temporary file from the old file's interesting section. # Create a temporary file from the old file's interesting section.
sed $E -e "1,/$header/d" \ sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \
-e '/^[[:space:]]+===/,$d' \
-e '/^[A-Z]+:/!d' \ -e '/^[A-Z]+:/!d' \
-e '/^(WARNING|ERROR):/d' \ -e '/^(WARNING|ERROR):/d' \
-e 's/\r$//' \ -e 's/\r$//' \
@ -101,8 +100,7 @@ sed $E -e "1,/$header/d" \
>/tmp/o$$-$OBASE >/tmp/o$$-$OBASE
# Create a temporary file from the new file's interesting section. # Create a temporary file from the new file's interesting section.
sed $E -e "1,/$header/d" \ sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \
-e '/^[[:space:]]+===/,$d' \
-e '/^[A-Z]+:/!d' \ -e '/^[A-Z]+:/!d' \
-e '/^(WARNING|ERROR):/d' \ -e '/^(WARNING|ERROR):/d' \
-e 's/\r$//' \ -e 's/\r$//' \