diff options
| author | thopre01 <thopre01@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-20 16:52:53 +0000 |
|---|---|---|
| committer | thopre01 <thopre01@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-20 16:52:53 +0000 |
| commit | 8182108962e74210eaca54cfd6625804f4d2b45c (patch) | |
| tree | 1156f835051731a2a63300d41c5bd48315427ca4 | |
| parent | e67b8ee3b1bf8156c2560b26568eab7c6675e583 (diff) | |
| download | gcc-8182108962e74210eaca54cfd6625804f4d2b45c.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249422 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rwxr-xr-x | 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 <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> * 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$//' \ |