Merge GDB 7.5.1

gdb/testsuite/dg-extract-results.sh

 #! /bin/sh
 
 # For a specified tool and optional list of test variants, extract
 # test results from one or more test summary (.sum) files and combine
 # the results into a new test summary file, sent to the standard output.
 # 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-2010, 2012 Free Software Foundation, Inc.
 # Contributed by Janis Johnson <janis187@us.ibm.com>
@@ skipping 327 matching lines @@
   }
 }
 EOF
 
   SUMS_AWK=${TMP}/sums.awk
   rm -f $SUMS_AWK
   cat << EOF > $SUMS_AWK
 BEGIN {
   variant="$VAR"
   tool="$TOOL"
-  passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; unsupcnt=0; unrescnt=0;
+  passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; kfailcnt=0; unsupcnt=0; unrescnt=0;
   curvar=""; insummary=0
 }
 /^Running target /              { curvar = \$3; next }
 /^# of /                        { if (variant == curvar) insummary = 1 }
 /^# of expected passes/         { if (insummary == 1) passcnt += \$5; next; }
 /^# of unexpected successes/    { if (insummary == 1) xpasscnt += \$5; next; }
 /^# of unexpected failures/     { if (insummary == 1) failcnt += \$5; next; }
 /^# of expected failures/       { if (insummary == 1) xfailcnt += \$5; next; }
+/^# of known failures/          { if (insummary == 1) kfailcnt += \$5; next; }
 /^# of untested testcases/      { if (insummary == 1) untstcnt += \$5; next; }
 /^# of unresolved testcases/    { if (insummary == 1) unrescnt += \$5; next; }
 /^# of unsupported tests/       { if (insummary == 1) unsupcnt += \$5; next; }
 /^$/                            { if (insummary == 1)
                                     { insummary = 0; curvar = "" }
                                   next
                                 }
 { next }
 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 (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 (kfailcnt != 0) printf ("# of known failures\t\t%d\n", kfailcnt)
   if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt)
   if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt)
   if (unsupcnt != 0) printf ("# of unsupported tests\t\t%d\n", unsupcnt)
 }
 EOF
 
   PVAR=`echo $VAR | sed 's,/,.,g'`
   TMPFILE=${TMP}/var-$PVAR
   rm -f $TMPFILE
   rm -f ${TMP}/list*
   cat ${TMP}/expfiles $SUM_FILES | $AWK -f $GUTS_AWK
   cat $SUM_FILES | $AWK -f $SUMS_AWK > $TMPFILE
   # If there are multiple variants, output the counts for this one;
   # otherwise there will just be the final counts at the end.
   test $VARIANT_COUNT -eq 1 || cat $TMPFILE
 done
 
 # Set up an awk script to get the combined summary counts for the tool.
 
 TOTAL_AWK=${TMP}/total.awk
 cat << EOF > $TOTAL_AWK
 BEGIN {
   tool="$TOOL"
-  passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; unsupcnt=0; unrescnt=0
+  passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; kfailcnt=0; unsupcnt=0; unrescnt=0
 }
 /^# of expected passes/         { passcnt += \$5 }
 /^# of unexpected failures/     { failcnt += \$5 }
 /^# of unexpected successes/    { xpasscnt += \$5 }
 /^# of expected failures/       { xfailcnt += \$5 }
+/^# of known failures/          { kfailcnt += \$5 }
 /^# of untested testcases/      { untstcnt += \$5 }
 /^# of unresolved testcases/    { unrescnt += \$5 }
 /^# of unsupported tests/       { unsupcnt += \$5 }
 END {
   printf ("\n\t\t=== %s Summary ===\n\n", tool)
   if (passcnt != 0) printf ("# of expected passes\t\t%d\n", passcnt)
   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 (kfailcnt != 0) printf ("# of known failures\t\t%d\n", kfailcnt)
   if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt)
   if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt)
   if (unsupcnt != 0) printf ("# of unsupported tests\t\t%d\n", unsupcnt)
 }
 EOF
 
 # Find the total summaries for the tool and add to the end of the output.
 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 -2 $FIRST_SUM | grep -q '^#' || tail -2 $FIRST_SUM
 
 exit 0