aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2010-03-22 20:38:58 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2010-03-22 20:38:58 +0000
commitc847d045a6a4948c2ce42d90e1ef2de17bace896 (patch)
tree48a7888dbb1e1a5357b593b50d243d2b81dac10f /gdb/testsuite
parent52e9fde8139062bf1bef6b9ec97dbdc647afcd47 (diff)
downloadgdb-c847d045a6a4948c2ce42d90e1ef2de17bace896.zip
gdb-c847d045a6a4948c2ce42d90e1ef2de17bace896.tar.gz
gdb-c847d045a6a4948c2ce42d90e1ef2de17bace896.tar.bz2
gdb/testsuite/
* dg-extract-results.sh: Sync with GCC HEAD (import r155655, r157175 and r157645).
Diffstat (limited to 'gdb/testsuite')
-rw-r--r--gdb/testsuite/ChangeLog5
-rwxr-xr-xgdb/testsuite/dg-extract-results.sh8
2 files changed, 9 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b00eced..7bfecc7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2010-03-22 Jan Kratochvil <jan.kratochvil@redhat.com>
+ * dg-extract-results.sh: Sync with GCC HEAD (import r155655, r157175
+ and r157645).
+
+2010-03-22 Jan Kratochvil <jan.kratochvil@redhat.com>
+
* gdb.dwarf2/dw2-empty-namespace.exp, gdb.dwarf2/dw2-empty-namespace.S:
New.
diff --git a/gdb/testsuite/dg-extract-results.sh b/gdb/testsuite/dg-extract-results.sh
index 518c19f..0ad85cb 100755
--- a/gdb/testsuite/dg-extract-results.sh
+++ b/gdb/testsuite/dg-extract-results.sh
@@ -6,7 +6,7 @@
# The resulting file can be used with test result comparison scripts for
# results from tests that were run in parallel. See usage() below.
-# Copyright (C) 2008, 2009 Free Software Foundation
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation
# Contributed by Janis Johnson <janis187@us.ibm.com>
#
# This file is part of GCC.
@@ -299,7 +299,7 @@ BEGIN {
next
}
}
-/\===/ { curvar = ""; next }
+/^\t\t=== .* ===$/ { curvar = ""; next }
/^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL):/ {
testname=\$2
# Ugly hack for gfortran.dg/dg.exp
@@ -365,8 +365,8 @@ BEGIN {
END {
printf ("\t\t=== %s Summary for %s ===\n\n", tool, variant)
if (passcnt != 0) printf ("# of expected passes\t\t%d\n", passcnt)
- if (xpasscnt != 0) printf ("# of unexpected successes\t%d\n", xpasscnt)
if (failcnt != 0) printf ("# of unexpected failures\t%d\n", failcnt)
+ if (xpasscnt != 0) printf ("# of unexpected successes\t%d\n", xpasscnt)
if (xfailcnt != 0) printf ("# of expected failures\t\t%d\n", xfailcnt)
if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt)
if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt)
@@ -418,6 +418,6 @@ cat ${TMP}/var-* | $AWK -f $TOTAL_AWK
# This is ugly, but if there's version output from the compiler under test
# at the end of the file, we want it. The other thing that might be there
# is the final summary counts.
-tail -n 2 $FIRST_SUM | grep -q '^#' || tail -n 2 $FIRST_SUM
+tail -2 $FIRST_SUM | grep -q '^#' || tail -2 $FIRST_SUM
exit 0