Index: gcc/contrib/test_summary |
diff --git a/gcc/contrib/test_summary b/gcc/contrib/test_summary |
index 9bb06051efd062c98b127eb018cacbd816f038e9..5fc49f52bda7a7ab0eedef0e9f6f96924b69f4bd 100755 |
--- a/gcc/contrib/test_summary |
+++ b/gcc/contrib/test_summary |
@@ -1,6 +1,6 @@ |
#! /bin/sh |
-# (C) 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2009 |
+# (C) 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2009, 2010 |
# Free Software Foundation |
# Originally by Alexandre Oliva <oliva@dcc.unicamp.br> |
@@ -75,9 +75,9 @@ for file in $files; do |
[ -f $file ] && |
anyfile=true && |
{ $anychange || |
- anychange=`diff -u $file.sent $file 2>/dev/null | |
+ anychange=`diff $file.sent $file 2>/dev/null | |
if test ! -f $file.sent || |
- egrep '^[-+](XPASS|FAIL)' >/dev/null; then |
+ egrep '^[<>] (XPASS|FAIL)' >/dev/null; then |
echo true |
else |
echo false |
@@ -91,7 +91,7 @@ if $forcemail || $anychange; then :; else mailto=nobody; fi && |
# We use cat instead of listing the files as arguments to AWK because |
# GNU awk 3.0.0 would break if any of the filenames contained `=' and |
# was preceded by an invalid ``variable'' name. |
-cat ./config.status $files | |
+( echo @TOPLEVEL_CONFIGURE_ARGUMENTS@ | ./config.status --file=-; cat $files ) | |
$AWK ' |
BEGIN { |
lang=""; configflags = ""; |
@@ -100,11 +100,8 @@ BEGIN { |
print "cat <<'"'"'EOF'"'"' |"; |
'${prepend_logs+" system(\"cat $prepend_logs\"); "}' |
} |
-($0 ~ /^[^ ]*\/configure / || $0 ~ /^# [^ ]*\/configure /) && |
-configflags == "" { |
+NR == 1 { |
configflags = $0 " "; |
- sub(/^# /, "", configflags); |
- sub(/^s,@TOPLEVEL_CONFIGURE_ARGUMENTS@,/, "", configflags); |
srcdir = configflags; |
sub(/\/configure .*/, "", srcdir); |
if ( system("test -f " srcdir "/LAST_UPDATED") == 0 ) { |
@@ -131,7 +128,7 @@ configflags == "" { |
$2 == "version" { save = $0; $1 = ""; $2 = ""; version = $0; gsub(/^ */, "", version); gsub(/\r$/, "", version); $0 = save; } |
/\===.*Summary/ { print ""; print; blanks=1; } |
/tests ===/ || /^(Target|Host|Native)/ || $2 == "version" { print; blanks=1; } |
-/^(XPASS|FAIL|UNRESOLVED|WARNING|ERROR|# of )/ { print; } |
+/^(XPASS|FAIL|UNRESOLVED|WARNING|ERROR|# of )/ { sub ("\r", ""); print; } |
/^using:/ { print ""; print; print ""; } |
# dumpall != 0 && /^X?(PASS|FAIL|UNTESTED)|^testcase/ { dumpall=0; } |
# dumpall != 0 { print; } |