Add NIOS2 support. Code from SourceyG++.

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

diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh
index 9d3c756..be7d47b 100755 (executable)
--- a/contrib/dg-extract-results.sh
+++ b/contrib/dg-extract-results.sh
@@ -224,7 +224,7 @@ else
   VARIANTS=""
   for VAR in $VARS
   do
   VARIANTS=""
   for VAR in $VARS
   do

-    grep -q "Running target $VAR" $SUM_FILES && VARIANTS="$VARIANTS $VAR"
+    grep "Running target $VAR" $SUM_FILES > /dev/null && VARIANTS="$VARIANTS $VAR"

   done
 fi
 
   done
 fi
 


@@ -299,7 +299,7 @@ BEGIN {
     next
   }
 }
     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
 /^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL):/ {
   testname=\$2
   # Ugly hack for gfortran.dg/dg.exp


@@ -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.
 # 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
+tail -2 $FIRST_SUM | grep '^#' > /dev/null || tail -2 $FIRST_SUM

 
 exit 0
 
 exit 0