From c847d045a6a4948c2ce42d90e1ef2de17bace896 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 22 Mar 2010 20:38:58 +0000 Subject: [PATCH] gdb/testsuite/ * dg-extract-results.sh: Sync with GCC HEAD (import r155655, r157175 and r157645). --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/dg-extract-results.sh | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b00eced3242..7bfecc76a47 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-03-22 Jan Kratochvil + + * dg-extract-results.sh: Sync with GCC HEAD (import r155655, r157175 + and r157645). + 2010-03-22 Jan Kratochvil * gdb.dwarf2/dw2-empty-namespace.exp, gdb.dwarf2/dw2-empty-namespace.S: diff --git a/gdb/testsuite/dg-extract-results.sh b/gdb/testsuite/dg-extract-results.sh index 518c19f6bee..0ad85cb7aa2 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 # # 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 -- 2.30.2