From: mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 2 Jun 2006 23:47:35 +0000 (+0000)
Subject: 	* compare_tests: Handle multilibs better.
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=4befda8b844823cbb51858d9d3475bf5dc7e6b90

	* compare_tests: Handle multilibs better.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114331 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 46731357181..3a59cb63dc7 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Richard Earnshaw  <rearnsha@arm.com>
+	    Mike Stump  <mrs@apple.com>
+
+	* compare_tests: Handle multilibs better.
+
 2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* texi2pod.pl: Correct handling of absolute @include.
diff --git a/contrib/compare_tests b/contrib/compare_tests
index a7fc6711efb..bcf678c52ea 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