[Gnash-commit] gnash ChangeLog testsuite/swfdec/gen_run_swfdec...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/29 21:09:49

Modified files:
        .              : ChangeLog 
        testsuite/swfdec: gen_run_swfdec_testsuite.sh 
                          swfdec_gnash_tester 

Log message:
        always take gnash crashes as real failures, expect it or not
        (yes, we have some crashes there..).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6081&r2=1.6082
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/gen_run_swfdec_testsuite.sh?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/swfdec_gnash_tester?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6081
retrieving revision 1.6082
diff -u -b -r1.6081 -r1.6082
--- ChangeLog   29 Mar 2008 20:52:01 -0000      1.6081
+++ ChangeLog   29 Mar 2008 21:09:49 -0000      1.6082
@@ -1,5 +1,11 @@
 2008-03-29 Sandro Santilli <address@hidden>
 
+       * testsuite/swfdec/: gen_run_swfdec_testsuite.sh, swfdec_gnash_tester:
+         always take gnash crashes as real failures, expect it or not
+         (yes, we have some crashes there..).
+
+2008-03-29 Sandro Santilli <address@hidden>
+
        * testsuite/swfdec/gen_run_swfdec_testsuite.sh: hint about tests
          that used to pass and are not passing anymore.
        * libbase/log.{cpp,h}: drop unused timestamp variation code.

Index: testsuite/swfdec/gen_run_swfdec_testsuite.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/gen_run_swfdec_testsuite.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/swfdec/gen_run_swfdec_testsuite.sh        29 Mar 2008 20:52:01 
-0000      1.15
+++ testsuite/swfdec/gen_run_swfdec_testsuite.sh        29 Mar 2008 21:09:49 
-0000      1.16
@@ -80,13 +80,17 @@
        else
                echo "NOTE: running \${testname} (expect pass: 
\${expectpasslabel})"
        fi
-       if ${SWFDEC_GNASH_TESTER} \${test} \${flags} > \${testname}.log; then
+
+       ${SWFDEC_GNASH_TESTER} \${test} \${flags} > \${testname}.log
+       ret=\$?
+       #echo "NOTE: ${SWFDEC_GNASH_TESTER} \${test} returned \$ret"
+       if [ \$ret -eq 0 ]; then
                if [ "\${expectpass}" = "yes" ]; then
                        echo "PASSED: \${testid}"
                else
                        echo "XPASSED: \${testid}"
                fi      
-       else
+       elif [ \$ret -eq 1 ]; then
                if [ "\${expectpass}" = "yes" ]; then
                        echo "FAILED: \${testid} (traces in 
\${testname}.trace-gnash, log in \${testname}.log)"
                else
@@ -96,6 +100,8 @@
                                echo "XFAILED: \${testid} (traces in 
\${testname}.trace-gnash, log in \${testname}.log)"
                        fi
                fi
+       else
+               echo "FAILED: \${testid} crashed gnash (stdout in 
\${testname}.out, stderr in \${testname}.err)"
        fi
 done
 

Index: testsuite/swfdec/swfdec_gnash_tester
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/swfdec_gnash_tester,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/swfdec/swfdec_gnash_tester        19 Mar 2008 18:27:49 -0000      
1.17
+++ testsuite/swfdec/swfdec_gnash_tester        29 Mar 2008 21:09:49 -0000      
1.18
@@ -13,7 +13,7 @@
 
 if [ -z "$1" ]; then
        echo "Usage: `basename $0` <swffile> [<flags>]" >&2
-       exit 1
+       exit 2
 fi
 
 
@@ -21,6 +21,8 @@
 shift
 FLAGS="$FLAGS $@"
 out=`basename "${in}"`.trace-gnash
+logout=`basename "${in}"`.out
+logerr=`basename "${in}"`.err
 use_orig=0
 exp="${in}.trace"
 if [ -e "${in}.trace.org" ]; then
@@ -30,16 +32,17 @@
 
 
 echo "Running ${GPROCESSOR} ${FLAGS} ${in}" >&2
-${GPROCESSOR} ${FLAGS} "$in"  | grep TRACE -A1 | sed '/^--$/d; s/.*TRACE: //; 
/\n*[0-9][0-9]*\].*/d; s/^$//;' > $out
+${GPROCESSOR} ${FLAGS} "$in" > $logout 2> $logerr
 if test "$?" != 0; then
        echo "gprocessor returned an error"
-       exit 1
-else
-       if [ "$use_orig" != 0 ]; then
+       exit 2
+fi
+
+grep TRACE -A1 ${logout} | sed '/^--$/d; s/.*TRACE: //; /\n*[0-9][0-9]*\].*/d; 
s/^$//;' > $out
+if [ "$use_orig" != 0 ]; then
                awk 'BEGIN {body=0;} { if (body) { print $0} else if (/^$/) 
{body=1} }' "$exp" | diff -u - "$out"
                exit $?
-       else
+else
                diff -u "$exp" "$out"
                exit $?
-       fi
 fi