[Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Dejagnu...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/22 10:04:38

Modified files:
        .              : ChangeLog 
        testsuite/misc-swfc.all: Dejagnu.sc check.sc 
                                 movieclip_destruction_test1.sc 

Log message:
                * testsuite/misc-swfc.all/Dejagnu.sc: add 2 args to the totals()
                  call, one if which is expected of tests to be run, if it 
doesn't
                  match actual number of tests run will print and record a FAIL
                  message.
                * testsuite/misc-swfc.all/check.sc: accept an arg in the 
totals()
                  macro to tell how many tests in total are expected to be run.
                * testsuite/misc-swfc.all/movieclip_destruction_test1.sc: expect
                  33 tests to be run.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4374&r2=1.4375
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Dejagnu.sc?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/check.sc?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4374
retrieving revision 1.4375
diff -u -b -r1.4374 -r1.4375
--- ChangeLog   22 Sep 2007 09:28:43 -0000      1.4374
+++ ChangeLog   22 Sep 2007 10:04:37 -0000      1.4375
@@ -1,5 +1,16 @@
 2007-09-22 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-swfc.all/Dejagnu.sc: add 2 args to the totals()
+         call, one if which is expected of tests to be run, if it doesn't
+         match actual number of tests run will print and record a FAIL
+         message.
+       * testsuite/misc-swfc.all/check.sc: accept an arg in the totals()
+         macro to tell how many tests in total are expected to be run.
+       * testsuite/misc-swfc.all/movieclip_destruction_test1.sc: expect
+         33 tests to be run.
+
+2007-09-22 Sandro Santilli <address@hidden>
+
        * testsuite/misc-swfc.all/movieclip_destruction_test1.sc: remove
          redundant test.
        * server/sprite_instance.cpp (execute_frame_tags): revert the 

Index: testsuite/misc-swfc.all/Dejagnu.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Dejagnu.sc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-swfc.all/Dejagnu.sc  6 Sep 2007 09:45:44 -0000       1.3
+++ testsuite/misc-swfc.all/Dejagnu.sc  22 Sep 2007 10:04:38 -0000      1.4
@@ -53,7 +53,23 @@
                 trace (msg);
             },
 
-            totals: function () {
+            totals: function (expectedTestsRun, msg) {
+               if ( arguments.length > 1 )
+               {
+                       ttr = 0;
+                       if ( this.passed ) ttr += this.passed;
+                       if ( this.failed ) ttr += this.failed;
+                       if ( this.xpassed ) ttr += this.xpassed;
+                       if ( this.xfailed ) ttr += this.xfailed;
+                       if ( this.untest ) ttr += this.untest;
+                       if ( this.unresolv ) ttr += this.unresolv;
+                       this.note("Total tests run: "+ttr+" typeof expected: 
"+typeof(expectedTestsRun));
+
+                       if ( expectedTestsRun != ttr )
+                       {
+                               this.fail("TOTAL tests run: "+ttr+", expected: 
"+expectedTestsRun+" ["+msg+"]");
+                       }
+               }
                 this.xtrace('#passed: '+ this.passed);
                 this.xtrace('#failed: '+ this.failed);
                 if ( this.xpassed ) {

Index: testsuite/misc-swfc.all/check.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/check.sc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-swfc.all/check.sc    6 Sep 2007 09:45:44 -0000       1.5
+++ testsuite/misc-swfc.all/check.sc    22 Sep 2007 10:04:38 -0000      1.6
@@ -44,7 +44,7 @@
 
 #define note(text) Dejagnu.note(text + _INFO_);
 
-#define totals() Dejagnu.totals()
+#define totals(x) Dejagnu.totals(x, _INFO_)
 
 #define MEDIA(x) MEDIADIR/x
 

Index: testsuite/misc-swfc.all/movieclip_destruction_test1.sc
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- testsuite/misc-swfc.all/movieclip_destruction_test1.sc      22 Sep 2007 
09:28:43 -0000      1.19
+++ testsuite/misc-swfc.all/movieclip_destruction_test1.sc      22 Sep 2007 
10:04:38 -0000      1.20
@@ -287,7 +287,7 @@
   .action:
     _root.check_equals(initActionExecuted, "mc2, mc3, mc61, mc6, mc8");
     stop();
-    totals();
+    totals(33);
   .end
   
 .end  // file end