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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/29 06:33:26

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

Log message:
                * testsuite/misc-swfc.all/: Dejagnu.sc, check.sc,
                  opcode_guard_test2.sc: add and use xtotals.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4471&r2=1.4472
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Dejagnu.sc?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/check.sc?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/opcode_guard_test2.sc?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4471
retrieving revision 1.4472
diff -u -b -r1.4471 -r1.4472
--- ChangeLog   29 Sep 2007 06:24:35 -0000      1.4471
+++ ChangeLog   29 Sep 2007 06:33:25 -0000      1.4472
@@ -1,5 +1,7 @@
 2007-09-29 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-swfc.all/: Dejagnu.sc, check.sc,
+         opcode_guard_test2.sc: add and use xtotals.
        * testsuite/actionscript.all/toString_valueOf.as: more tests for
          TextField, toString and comparison..
 

Index: testsuite/misc-swfc.all/Dejagnu.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Dejagnu.sc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-swfc.all/Dejagnu.sc  22 Sep 2007 10:04:38 -0000      1.4
+++ testsuite/misc-swfc.all/Dejagnu.sc  29 Sep 2007 06:33:25 -0000      1.5
@@ -81,6 +81,34 @@
            
             },
 
+            xtotals: 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.xfail("TOTAL tests run: "+ttr+", expected: 
"+expectedTestsRun+" ["+msg+"]");
+                       }
+               }
+                this.xtrace('#passed: '+ this.passed);
+                this.xtrace('#failed: '+ this.failed);
+                if ( this.xpassed ) {
+                    this.xtrace('#unexpected successes: '+ this.xpassed);
+                }
+                if ( this.xfailed ) {
+                    this.xtrace('#expected failures: '+ this.xfailed);
+                }
+           
+            },
+
             check_equals: function (obt, exp, msg, expression) {
                 if(msg == null) msg = "";
                 if ( obt == exp ) 

Index: testsuite/misc-swfc.all/check.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/check.sc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-swfc.all/check.sc    22 Sep 2007 10:04:38 -0000      1.6
+++ testsuite/misc-swfc.all/check.sc    29 Sep 2007 06:33:25 -0000      1.7
@@ -46,6 +46,8 @@
 
 #define totals(x) Dejagnu.totals(x, _INFO_)
 
+#define xtotals(x) Dejagnu.xtotals(x, _INFO_)
+
 #define MEDIA(x) MEDIADIR/x
 
 #endif

Index: testsuite/misc-swfc.all/opcode_guard_test2.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/opcode_guard_test2.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/opcode_guard_test2.sc       29 Sep 2007 05:44:02 
-0000      1.1
+++ testsuite/misc-swfc.all/opcode_guard_test2.sc       29 Sep 2007 06:33:25 
-0000      1.2
@@ -105,7 +105,7 @@
     stop();
     // Gnash failed on totals() by discarding some checks.
     // should we have a xtotals()?
-    totals(6);
+    xtotals(6);
   .end
   
 .end  // file end