aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorThomas Preud'homme <thomas.preudhomme@arm.com>2017-06-21 16:20:57 +0000
committerThomas Preud'homme <thopre01@gcc.gnu.org>2017-06-21 16:20:57 +0000
commit1e55769b155009b134665f1455cf937ce30525f8 (patch)
tree4bafad5213dec1c0bb2cc7c680c8a14cd932f421 /contrib
parent827c925e6a80a608badf61b1991a1aef8ce5b8b3 (diff)
downloadgcc-1e55769b155009b134665f1455cf937ce30525f8.zip
gcc-1e55769b155009b134665f1455cf937ce30525f8.tar.gz
gcc-1e55769b155009b134665f1455cf937ce30525f8.tar.bz2
Fix variant selection in dg-cmp-results.sh
2017-06-21 Thomas Preud'homme <thomas.preudhomme@arm.com> contrib/ * dg-cmp-results.sh: Restore filtering on target variant. From-SVN: r249463
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog4
-rwxr-xr-xcontrib/dg-cmp-results.sh4
2 files changed, 6 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 180b6f3..51adaaa 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-21 Thomas Preud'homme <thomas.preudhomme@arm.com>
+
+ * dg-cmp-results.sh: Restore filtering on target variant.
+
2017-06-20 Thomas Preud'homme <thomas.preudhomme@arm.com>
* 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 921e933..5f2fed5 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$//' \