From b0a5704b4cd613c9ce722e2a7de530ac6998cd8c Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Tue, 20 Sep 2016 20:14:14 +0000 Subject: [PATCH] Report DejaGnu ERROR messages in compare_tests 2016-09-20 Christophe Lyon * compare_tests: Take ERROR messages into account when comparing. From-SVN: r240288 --- contrib/ChangeLog | 5 +++++ contrib/compare_tests | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index d2286e52e53..39ff76d4c98 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2016-09-20 Christophe Lyon + + * compare_tests: Take ERROR messages into account when + comparing. + 2016-08-17 Martin Liska * mark_spam.py: Mark as spam all comments done by a creator. diff --git a/contrib/compare_tests b/contrib/compare_tests index 8ecf8245b8d..d16e7e9737e 100755 --- a/contrib/compare_tests +++ b/contrib/compare_tests @@ -107,8 +107,8 @@ elif [ -d "$1" -o -d "$2" ] ; then usage "Must specify either two directories or two files" fi -sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$1" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' | cut -c1-2000 >$tmp1 -sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$2" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' | cut -c1-2000 >$tmp2 +sed 's/^XFAIL/FAIL/; s/^ERROR/FAIL/; s/^XPASS/PASS/' < "$1" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' | cut -c1-2000 >$tmp1 +sed 's/^XFAIL/FAIL/; s/^ERROR/FAIL/; s/^XPASS/PASS/' < "$2" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' | cut -c1-2000 >$tmp2 before=$tmp1 now=$tmp2 -- 2.30.2