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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/29 16:09:39

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

Log message:
                * testsuite/misc-ming.all/ming_utils.c (Dejagnu class):
                  add totals(n, msg)  and xtotals(n, msg) to check number
                  of tests being run.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4474&r2=1.4475
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4474
retrieving revision 1.4475
diff -u -b -r1.4474 -r1.4475
--- ChangeLog   29 Sep 2007 13:05:46 -0000      1.4474
+++ ChangeLog   29 Sep 2007 16:09:38 -0000      1.4475
@@ -1,3 +1,9 @@
+2007-09-29 Sandro Santilli <address@hidden>
+
+       * testsuite/misc-ming.all/ming_utils.c (Dejagnu class): 
+         add totals(n, msg)  and xtotals(n, msg) to check number
+         of tests being run.
+
 2007-09-29 Benjamin Wolsey <address@hidden>
 
        * docs: update Mozilla plugin install information to reflect current

Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- testsuite/misc-ming.all/ming_utils.c        31 Jul 2007 17:07:11 -0000      
1.28
+++ testsuite/misc-ming.all/ming_utils.c        29 Sep 2007 16:09:39 -0000      
1.29
@@ -205,7 +205,7 @@
                // " _root.xtrace(msg);\n"
                " trace (msg); "
                "};\n"
-               "TestState.prototype.totals = function() {\n"
+               "TestState.prototype.printtotals = function() {\n"
                " _root.xtrace('#passed: '+ this.passed);\n"
                " trace('#passed: '+ this.passed);\n"
                " _root.xtrace('#failed: '+ this.failed);\n"
@@ -219,6 +219,27 @@
                "   trace('#expected failures: '+ this.xfailed);\n"
                " }\n"
                "};\n"
+               "TestState.prototype.totals = function(exp, msg) {\n"
+               " var obt = this.testcount(); "
+               " if ( exp != undefined && obt != exp ) { "
+               "   this.fail('Tests run '+obt+' (expected '+exp+') 
['+msg+']'); "
+               " }"
+               " this.printtotals();"
+               "};\n"
+               "TestState.prototype.xtotals = function(exp, msg) {\n"
+               " var obt = this.testcount(); "
+               " if ( exp != undefined && obt != exp ) { "
+               "   this.xfail('Tests run '+obt+' (expected '+exp+') 
['+msg+']'); "
+               " }"
+               " this.printtotals();"
+               "};\n"
+               "TestState.prototype.testcount = function() {\n"
+               " c=this.passed;\n"
+               " c+=this.failed;\n"
+               " if ( this.xpassed ) c+=this.xpassed;\n"
+               " if ( this.xfailed ) c+=this.xfailed;\n"
+               " return c;"
+               "};\n"
                "_root.runtest = new TestState();\n"
                "_root.check_equals = function(obt, exp) {\n"
                " if ( obt == exp ) _root.runtest.pass(obt+' == '+exp);\n"
@@ -252,8 +273,11 @@
                " _root.xtrace(msg);\n"
                " trace(msg);\n"
                "};\n"
-               "_root.totals = function() {\n"
-               " _root.runtest.totals();\n"
+               "_root.totals = function(exp, info) {\n"
+               " _root.runtest.totals(exp, info);\n"
+               "};\n"
+               "_root.xtotals = function(exp, info) {\n"
+               " _root.runtest.xtotals(exp, info);\n"
                "};\n"
                "_root.dejagnu_module_initialized = 1;\n"
        );