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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/16 14:00:20

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: check.as dejagnu_so_init.as 
        testsuite/misc-ming.all: ming_utils.c 

Log message:
                * testsuite/actionscript.all/: dejagnu_so_init.as, check.as:
                  check for initialized Dejagnu module moved from init.as to
                  check.as (we know it will NOT be initialized in first frame)
                  and made warning message much more verbose.
                * testsuite/misc-ming.all/ming_utils.c (get_dejagnu_actions):
                  Set the 'dejagnu_module_initialized' variable on the _root 
movie.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1630&r2=1.1631
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/check.as?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/dejagnu_so_init.as?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1630
retrieving revision 1.1631
diff -u -b -r1.1630 -r1.1631
--- ChangeLog   16 Nov 2006 12:59:02 -0000      1.1630
+++ ChangeLog   16 Nov 2006 14:00:20 -0000      1.1631
@@ -1,5 +1,14 @@
 2006-11-16 Sandro Santilli <address@hidden>
 
+       * testsuite/actionscript.all/: dejagnu_so_init.as, check.as:
+         check for initialized Dejagnu module moved from init.as to
+         check.as (we know it will NOT be initialized in first frame)
+         and made warning message much more verbose.
+       * testsuite/misc-ming.all/ming_utils.c (get_dejagnu_actions):
+         Set the 'dejagnu_module_initialized' variable on the _root movie.
+
+2006-11-16 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/ming_utils.c (get_dejagnu_actions):
          Set a 'dejagnu_module_initialized' variable to one after
          initialization; it can then be used by loaders for consistency

Index: testsuite/actionscript.all/check.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/check.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/actionscript.all/check.as 16 Nov 2006 10:53:20 -0000      1.11
+++ testsuite/actionscript.all/check.as 16 Nov 2006 14:00:20 -0000      1.12
@@ -41,10 +41,28 @@
 //       will also need put dejagnu_so_init.as in first frame
 //       and put dejagnu_so_fini.as in last frame.
 #ifdef USE_DEJAGNU_MODULE
+
 // When using ming-0.4.0beta or prior, the __shared_assets
 // movieclip will NOT be usable, thus we fallback to using
 // bare 'trace' function
+
+if ( ! dejagnu_module_initialized )
+{
+       trace("No properly initialized dejagnu module found.\n"
+               + " Possible reasons are:\n"
+               + " 1) this testcase was compiled using a bogus\n"
+               + "    makeswf version (up to Ming-0.4.0beta2).\n"
+               + " 2) You are using a player with bogus IMPORT \n"
+               + "    tag handling (actions in the imported movie \n"
+               + "    have not been run yet and we should be in frame2\n"
+               + "    of the importer movie so far).\n"
+               + " 4) The Dejagnu.swf file is corrupted or was not found\n"
+               + "    where expected.\n"
+               + "In any case, we will fallback to trace mode\n\n" );
+}
+
 # define trace(x) if ( xtrace ) xtrace(x); else trace(x)
+
 #endif
 
 // Define USE_RTRACE to use "report" trace

Index: testsuite/actionscript.all/dejagnu_so_init.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/dejagnu_so_init.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/actionscript.all/dejagnu_so_init.as       16 Nov 2006 13:20:51 
-0000      1.3
+++ testsuite/actionscript.all/dejagnu_so_init.as       16 Nov 2006 14:00:20 
-0000      1.4
@@ -9,12 +9,6 @@
 // make it visible to *see* visual traces
 if ( __shared_assets != undefined )
 {
-       if ( ! __shared_assets.dejagnu_module_initialized )
-       {
-               trace("No initialized dejagnu module found in __shared_assets"
-                       + ": used a bogus Ming version to build Dejagnu.swf ? " 
-                       + "(it's bogus up to 0.4.0beta2)");
-       }
        __shared_assets._visible = true;
 }
 else

Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/misc-ming.all/ming_utils.c        16 Nov 2006 12:53:40 -0000      
1.12
+++ testsuite/misc-ming.all/ming_utils.c        16 Nov 2006 14:00:20 -0000      
1.13
@@ -207,7 +207,7 @@
                " if ( a ) _root.runtest.xpass(a);\n"
                " else _root.runtest.xfail(a);\n"
                "};\n"
-               "dejagnu_module_initialized = 1;\n"
+               "_root.dejagnu_module_initialized = 1;\n"
        );
 
        return compileSWFActionCode(buf);