Hi Mike,
Sorry, there was a mistake in the patch I sent. Please find an updated patch
below.
ChangeLog entry unchanged:
*** contrib/ChangeLog ***
2017-06-14 Thomas Preud'homme <thomas.preudho...@arm.com>
* dg-cmp-results.sh: Keep test result lines rather than throwing
header and summary to support sum files with multiple tools.
Is this still ok?
Best regards,
Thomas
On 19/06/17 16:55, Mike Stump wrote:
On Jun 14, 2017, at 5:30 AM, Thomas Preudhomme <thomas.preudho...@foss.arm.com>
wrote:
2017-06-14 Thomas Preud'homme <thomas.preudho...@arm.com>
* dg-cmp-results.sh: Keep test result lines rather than throwing
header and summary to support sum files with multiple tools.
Tested successfully on sum file with single tool with similar results
and on sum file with multiple tools now showing a regression with patch
proposed in https://gcc.gnu.org/ml/gcc-patches/2017-06/msg00875.html
Is this ok for trunk?
Ok.
diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh
index d291769547dcd2a02ecf6f80d60d6be7802af4fd..921e9337d1f8ffea78ef566c351fb48a8f6ca064 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$//' \
