From afc474f8ca3104009a738e29b03ca129a1eea1ac Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Tue, 20 Jun 2017 16:52:53 +0000 Subject: [PATCH] Support multi-tool sum files in dg-cmp-results.sh 2017-06-20 Thomas Preud'homme 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 --- contrib/ChangeLog | 5 +++++ contrib/dg-cmp-results.sh | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index e2cbd7902fc..180b6f34340 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2017-06-20 Thomas Preud'homme + + * 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 * filter_params.py: diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh index d291769547d..921e9337d1f 100755 --- a/contrib/dg-cmp-results.sh +++ b/contrib/dg-cmp-results.sh @@ -90,8 +90,7 @@ echo "Newer log file: $NFILE" 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' \ +sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \ @@ -101,8 +100,7 @@ sed $E -e "1,/$header/d" \ >/tmp/o$$-$OBASE # Create a temporary file from the new file's interesting section. -sed $E -e "1,/$header/d" \ - -e '/^[[:space:]]+===/,$d' \ +sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \