PR testsuite/39807

[pf3gnuchains/gcc-fork.git] / contrib / dg-extract-results.sh

diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh
index 75ae38f..518c19f 100755 (executable)
--- a/contrib/dg-extract-results.sh
+++ b/contrib/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.
 
 # 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 Free Software Foundation
+# Copyright (C) 2008, 2009 Free Software Foundation

 # Contributed by Janis Johnson <janis187@us.ibm.com>
 #
 # This file is part of GCC.
 # Contributed by Janis Johnson <janis187@us.ibm.com>
 #
 # This file is part of GCC.


@@ -148,26 +148,28 @@ if [ "$TOOL" = acats ]; then
   ACATS_AWK=${TMP}/acats.awk
   cat <<EOF > $ACATS_AWK
 BEGIN {
   ACATS_AWK=${TMP}/acats.awk
   cat <<EOF > $ACATS_AWK
 BEGIN {

-  print_prologue=1; chapter=""; insummary=0
+  print_prologue=1; curfile=""; insummary=0

   passcnt=0; failcnt=0; unsupcnt=0; failures=""
 }
   passcnt=0; failcnt=0; unsupcnt=0; failures=""
 }

-/=== acats configuration ===/ {
+/^[ \t]*=== acats configuration ===/ {

   insummary=0
   if (print_prologue) print
   next
 }
   insummary=0
   if (print_prologue) print
   next
 }

-/=== acats tests ===/ {
+/^[ \t]*=== acats tests ===/ {

   if (print_prologue) print
   print_prologue=0
   next
 }
 /^Running chapter / {
   if (print_prologue) print
   print_prologue=0
   next
 }
 /^Running chapter / {

-  chapter=\$3
-  print > "${TMP}/chapter-"chapter
+  if (curfile) close (curfile)
+  curfile="${TMP}/chapter-"\$3
+  print >> curfile

   next
 }
   next
 }

-/=== acats Summary ===/ {
-  chapter=""
+/^[ \t]*=== acats Summary ===/ {
+  if (curfile) close (curfile)
+  curfile=""

   insummary=1
   next
 }
   insummary=1
   next
 }


@@ -182,7 +184,7 @@ BEGIN {
 }
 {
   if (print_prologue) { print; next }
 }
 {
   if (print_prologue) { print; next }

-  if (chapter) print > "${TMP}/chapter-"chapter
+  if (curfile) print >> curfile

 }
 END {
   system ("cat ${TMP}/chapter-*")
 }
 END {
   system ("cat ${TMP}/chapter-*")


@@ -194,6 +196,7 @@ END {
 }
 EOF
 
 }
 EOF
 

+  rm -f ${TMP}/chapter-*

   $AWK -f $ACATS_AWK $SUM_FILES
   exit 0
 fi
   $AWK -f $ACATS_AWK $SUM_FILES
   exit 0
 fi


@@ -270,6 +273,7 @@ BEGIN {
   expfileno=1
   cnt=0
   print_using=0
   expfileno=1
   cnt=0
   print_using=0

+  need_close=0

 }
 /^EXPFILE: / {
   expfiles[expfileno] = \$2
 }
 /^EXPFILE: / {
   expfiles[expfileno] = \$2


@@ -287,8 +291,10 @@ BEGIN {
 /^Running / {
   print_using=0
   if (variant == curvar) {
 /^Running / {
   print_using=0
   if (variant == curvar) {

+    if (need_close) close(curfile)

     curfile="${TMP}/list"expfilesr[\$2]
     expfileseen[\$2]=expfileseen[\$2] + 1
     curfile="${TMP}/list"expfilesr[\$2]
     expfileseen[\$2]=expfileseen[\$2] + 1

+    need_close=0

     testname="00"
     next
   }
     testname="00"
     next
   }


@@ -303,11 +309,12 @@ BEGIN {
 /^$/ { if ("$MODE" == "sum") next }
 { if (variant == curvar && curfile) {
     if ("$MODE" == "sum") {
 /^$/ { if ("$MODE" == "sum") next }
 { if (variant == curvar && curfile) {
     if ("$MODE" == "sum") {

-      printf "%s %08d|", testname, cnt > curfile
+      printf "%s %08d|", testname, cnt >> curfile

       cnt = cnt + 1
     }
     filewritten[curfile]=1
       cnt = cnt + 1
     }
     filewritten[curfile]=1

-    print > curfile
+    need_close=1
+    print >> curfile

   } else
     next
 }
   } else
     next
 }