[Gnash-commit] gnash ChangeLog testsuite/actionscript.all/deja...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/16 23:54:44

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: dejagnu_so_init.as dejagnu.as 

Log message:
                * testsuite/actionscript.all/dejagnu_so_init.as: add
                  totals() in fallback implementation (when load of Dejagnu.swf
                  fails)
                * testsuite/actionscript.all/dejagnu.as: be compatible with
                  DEJAGNU shared lib.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1638&r2=1.1639
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/dejagnu_so_init.as?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/dejagnu.as?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1638
retrieving revision 1.1639
diff -u -b -r1.1638 -r1.1639
--- ChangeLog   16 Nov 2006 23:32:12 -0000      1.1638
+++ ChangeLog   16 Nov 2006 23:54:44 -0000      1.1639
@@ -1,5 +1,13 @@
 2006-11-16 Sandro Santilli <address@hidden>
 
+       * testsuite/actionscript.all/dejagnu_so_init.as: add
+         totals() in fallback implementation (when load of Dejagnu.swf
+         fails)
+       * testsuite/actionscript.all/dejagnu.as: be compatible with
+         DEJAGNU shared lib.
+
+2006-11-16 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/: check.as, dejagnu_so_init.as:
          if USE_DEJAGNU_MODULE is defined have dejagnu_so_init.as
          print SWF and Player version (so we can print once for a 

Index: testsuite/actionscript.all/dejagnu_so_init.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/dejagnu_so_init.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/dejagnu_so_init.as       16 Nov 2006 23:32:12 
-0000      1.6
+++ testsuite/actionscript.all/dejagnu_so_init.as       16 Nov 2006 23:54:44 
-0000      1.7
@@ -76,20 +76,50 @@
                        + "In any case, we will fallback to trace mode\n\n" );
 
                // provide fall-back functions
+
+               // Track our state
+               var _passed = 0;
+               var _failed = 0;
+               var _xpassed = 0;
+               var _xfailed = 0;
+               var _untest = 0; 
+               var _unresolv = 0;
+
                info = function(msg) {
                        trace(msg);
                };
                pass_check = function (msg) {
                        trace('PASSED: '+msg);
+                       ++_passed;
                };
                xpass_check = function (msg) {
                        trace('XPASSED: '+msg);
+                       ++_xpassed;
                };
                fail_check = function (msg) {
                        trace('FAILED: '+msg);
+                       ++_failed;
                };
                xfail_check = function (msg) {
                        trace('XFAILED: '+msg);
+                       ++_xfailed;
+               };
+               totals = function() {
+                       info("Totals:"); 
+                       info("    passed: " + _passed ); 
+                       info("    failed: " + _failed );
+                       if (_xfailed) {
+                               info("    expected failures: " + _xfailed);
+                       }
+                       if (_xpassed) {
+                               info("    unexpected passes: " + _xpassed); 
+                       }
+                       if (_untest) {
+                               info("    untested: " + _untest); 
+                       }
+                       if (_unresolv) {
+                               info("    unresolved: " + _unresolv); 
+                       }
                };
 
                // Print run environment info

Index: testsuite/actionscript.all/dejagnu.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/dejagnu.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/dejagnu.as       5 Nov 2006 00:45:27 -0000       
1.6
+++ testsuite/actionscript.all/dejagnu.as       16 Nov 2006 23:54:44 -0000      
1.7
@@ -30,12 +30,25 @@
 // only differ in the types of data displayed. Differnt data for
 // different folks works for me as long as the standard keywords are
 // used to keep DejaGnu happy.
-rcsid="$Id: dejagnu.as,v 1.6 2006/11/05 00:45:27 rsavoye Exp $";
+rcsid="$Id: dejagnu.as,v 1.7 2006/11/16 23:54:44 strk Exp $";
 
 #include "check.as"
 
-// Track our state
+#define note(text) info(text)
+
+#ifdef USE_DEJAGNU_MODULE 
+
+#define pass(text) pass_check(text + " [" + __LINE__ + "]")
+#define fail(text) fail_check(text + " [" + __LINE__ + "]")
+#define xpass(text) xpass_check(text + " [" + __LINE__ + "]")
+#define xfail(text) xfail_check(text + " [" + __LINE__ + "]")
+#define untested(text) untested_check(text + " [" + __LINE__ + "]")
+#define unresolved(text) unresolved_check(text + " [" + __LINE__ + "]")
+#define totals()
+
+#else // ndef USE_DEJAGNU_MODULE
 
+// Track our state
 var passed = 0;
 var failed = 0;
 var xpassed = 0;
@@ -43,6 +56,7 @@
 var untest = 0; 
 var unresolv = 0;
 
+#if 0 // seems unused anyway
 //
 // Use dejagnu(<expression>)
 // Make sure your expression doesn't contain single quotes
@@ -53,6 +67,7 @@
 
 //     if ( expr ) pass(text);
 //     else fail(text);
+#endif // unused block
 
 // These are the four primary test states as required by the POSIX
 // testing methodologies standard.
@@ -63,9 +78,6 @@
 #define untested(text) untest++; trace("UNTESTED: " + text + " [" + __LINE__ + 
"]")
 #define unresolved(text) unresolv++; trace("UNRESOLVED: " + text + " [" + 
__LINE__ + "]")
 
-// 
-#define note(text) trace(text)
-
 #define totals() \
         trace("Totals:"); \
         trace("    passed: " + passed ); \
@@ -75,5 +87,6 @@
         if (untest) trace("    untested: " + untest); \
         if (unresolv) trace("    unresolved: " + unresolv); \
 
+#endif // ndef USE_DEJAGNU_MODULE
 
 #endif // _DEJAGNU_AS_