From f5aef4e2dd18cb8967b3e93736c5fad3b7a0b3d6 Mon Sep 17 00:00:00 2001 From: thopre01 Date: Wed, 21 Jun 2017 16:20:57 +0000 Subject: [PATCH] Fix variant selection in dg-cmp-results.sh 2017-06-21 Thomas Preud'homme contrib/ * dg-cmp-results.sh: Restore filtering on target variant. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249463 138bc75d-0d04-0410-961f-82ee72b054a4 --- contrib/ChangeLog | 4 ++++ contrib/dg-cmp-results.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 180b6f34340..51adaaa178f 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2017-06-21 Thomas Preud'homme + + * dg-cmp-results.sh: Restore filtering on target variant. + 2017-06-20 Thomas Preud'homme * dg-cmp-results.sh: Keep test result lines rather than throwing diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh index 921e9337d1f..5f2fed5ec3f 100755 --- a/contrib/dg-cmp-results.sh +++ b/contrib/dg-cmp-results.sh @@ -90,7 +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 '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ +sed $E -e "/$header/,/^[[:space:]]+===.*Summary ===/!d" \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \ @@ -100,7 +100,7 @@ sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ >/tmp/o$$-$OBASE # Create a temporary file from the new file's interesting section. -sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ +sed $E -e "/$header/,/^[[:space:]]+===.*Summary ===/!d" \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \ -- 2.11.4.GIT