From 6f4dea39dd05ed356cac0501c88d44a83cffb2ff Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Tue, 6 Jun 2006 04:28:11 +0000 Subject: Import from GCC tree: 2006-06-02 Richard Earnshaw Mike Stump * compare_tests: Handle multilibs better. --- ChangeLog | 8 ++++++++ contrib/compare_tests | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd1d48a..2f39685 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2006-06-06 Ben Elliston + Import from GCC tree: + 2006-06-02 Richard Earnshaw + Mike Stump + + * compare_tests: Handle multilibs better. + +2006-06-06 Ben Elliston + * doc/dejagnu.texi: Regnerate using Docbook2X 0.8.7. * configure.ac: Check for docbook2texi, not docbook2x-texi. The diff --git a/contrib/compare_tests b/contrib/compare_tests index a7fc671..bcf678c 100755 --- a/contrib/compare_tests +++ b/contrib/compare_tests @@ -22,8 +22,8 @@ if [ "$2" = "" ]; then exit 2 fi -sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$1" >$tmp1 -sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$2" >$tmp2 +sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$1" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' >$tmp1 +sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$2" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' >$tmp2 before=$tmp1 now=$tmp2 -- cgit v1.1