aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2006-06-06 04:28:11 +0000
committerBen Elliston <bje@gnu.org>2006-06-06 04:28:11 +0000
commit6f4dea39dd05ed356cac0501c88d44a83cffb2ff (patch)
treeceb701aca0d396e2648e61ca4fd414aaeef49e86
parent469f58f9108952f5f9a6dc021df734118d5c8e7e (diff)
downloaddejagnu-6f4dea39dd05ed356cac0501c88d44a83cffb2ff.zip
dejagnu-6f4dea39dd05ed356cac0501c88d44a83cffb2ff.tar.gz
dejagnu-6f4dea39dd05ed356cac0501c88d44a83cffb2ff.tar.bz2
Import from GCC tree:
2006-06-02 Richard Earnshaw <rearnsha@arm.com> Mike Stump <mrs@apple.com> * compare_tests: Handle multilibs better.
-rw-r--r--ChangeLog8
-rwxr-xr-xcontrib/compare_tests4
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 <bje@gnu.org>
+ Import from GCC tree:
+ 2006-06-02 Richard Earnshaw <rearnsha@arm.com>
+ Mike Stump <mrs@apple.com>
+
+ * compare_tests: Handle multilibs better.
+
+2006-06-06 Ben Elliston <bje@gnu.org>
+
* 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