summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorclyon <clyon@138bc75d-0d04-0410-961f-82ee72b054a4>2016-09-20 20:14:14 +0000
committerclyon <clyon@138bc75d-0d04-0410-961f-82ee72b054a4>2016-09-20 20:14:14 +0000
commit2e99c3fd71ef006280e5cb28bd02d12b0068cb1e (patch)
tree8b28a3b2c370a3adc8e1bec7f816f1f48510607c /contrib
parent4345f456a431e03df663420bb3a8ff17bdb879de (diff)
Report DejaGnu ERROR messages in compare_tests
2016-09-20 Christophe Lyon <christophe.lyon@linaro.org> * compare_tests: Take ERROR messages into account when comparing. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@240288 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog5
-rwxr-xr-xcontrib/compare_tests4
2 files changed, 7 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index d2286e52e536..39ff76d4c98c 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-20 Christophe Lyon <christophe.lyon@linaro.org>
+
+ * compare_tests: Take ERROR messages into account when
+ comparing.
+
2016-08-17 Martin Liska <mliska@suse.cz>
* mark_spam.py: Mark as spam all comments done by a creator.
diff --git a/contrib/compare_tests b/contrib/compare_tests
index 8ecf8245b8d0..d16e7e9737e8 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