[Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/08 06:33:54

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am loop_test9.c ming_utils.c 

Log message:
                * testsuite/misc-ming.all/ming_utils.c: have totals() and 
friend also
                  print a final line containing grand totals. This will be 
easier
                  to use for consistency checking from the 
generic-testrunner.sh.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4564&r2=1.4565
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.158&r2=1.159
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loop_test9.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4564
retrieving revision 1.4565
diff -u -b -r1.4564 -r1.4565
--- ChangeLog   8 Oct 2007 06:21:44 -0000       1.4564
+++ ChangeLog   8 Oct 2007 06:33:53 -0000       1.4565
@@ -1,5 +1,8 @@
 2007-10-08 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/ming_utils.c: have totals() and friend also
+         print a final line containing grand totals. This will be easier
+         to use for consistency checking from the generic-testrunner.sh.
        * testsuite/misc-ming.all/: Makefile.am, loop_test9.c: test that
          a PlaceObject-placed instance in a depth higher then 0 (after
          depth-shift) doesn't get removed on jump-back. Verifies behaviour

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- testsuite/misc-ming.all/Makefile.am 8 Oct 2007 06:21:45 -0000       1.158
+++ testsuite/misc-ming.all/Makefile.am 8 Oct 2007 06:33:54 -0000       1.159
@@ -545,7 +545,7 @@
        ./loop_test9 $(top_srcdir)/testsuite/media
 
 loop_test9runner: $(srcdir)/../generic-testrunner.sh loop_test9.swf Makefile
-       sh $< -r10 -f20 -c "END OF TEST" $(top_builddir) loop_test9.swf > $@
+       sh $< -r10 -f20 -c "#total tests" $(top_builddir) loop_test9.swf > $@
        chmod 755 $@
        
 shape_test_SOURCES = shape_test.c

Index: testsuite/misc-ming.all/loop_test9.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loop_test9.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/loop_test9.c        8 Oct 2007 06:21:45 -0000       
1.1
+++ testsuite/misc-ming.all/loop_test9.c        8 Oct 2007 06:33:54 -0000       
1.2
@@ -145,8 +145,6 @@
 
       "totals(7);"
 
-      "trace('END OF TEST');"
-
        ));
   SWFMovie_nextFrame(mo);
 

Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- testsuite/misc-ming.all/ming_utils.c        1 Oct 2007 06:33:54 -0000       
1.30
+++ testsuite/misc-ming.all/ming_utils.c        8 Oct 2007 06:33:54 -0000       
1.31
@@ -178,6 +178,10 @@
                " this.untest = 0;\n"
                " this.unresolve = 0;\n"
                "};\n"
+               "TestState.prototype.note = function (msg) {\n"
+               " _root.xtrace(msg);\n"
+               " trace (msg); "
+               "};\n"
                "TestState.prototype.fail = function (why) {\n"
                " this.failed++;\n"
                " var msg = 'FAILED: '+why;\n"
@@ -206,18 +210,15 @@
                " trace (msg); "
                "};\n"
                "TestState.prototype.printtotals = function() {\n"
-               " _root.xtrace('#passed: '+ this.passed);\n"
-               " trace('#passed: '+ this.passed);\n"
-               " _root.xtrace('#failed: '+ this.failed);\n"
-               " trace('#failed: '+ this.failed);\n"
+               " this.note('#passed: '+ this.passed);\n"
+               " this.note('#failed: '+ this.failed);\n"
                " if ( this.xpassed ) {\n"
-               "   _root.xtrace('#unexpected successes: '+ this.xpassed);\n"
-               "   trace('#unexpected successes: '+ this.xpassed);\n"
+               "   this.note('#unexpected successes: '+ this.xpassed);\n"
                " }\n"
                " if ( this.xfailed ) {\n"
-               "   _root.xtrace('#expected failures: '+ this.xfailed);\n"
-               "   trace('#expected failures: '+ this.xfailed);\n"
+               "   this.note('#expected failures: '+ this.xfailed);\n"
                " }\n"
+               " this.note('#total tests run: '+ this.testcount());\n"
                "};\n"
                "TestState.prototype.totals = function(exp, msg) {\n"
                " var obt = this.testcount(); "