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

[Sandro Santilli]

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

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

Log message:
                * testsuite/misc-ming.all/ming_utils.h: provide a CALLFRAME
                  macro to use the syntax recognized by the detected Ming
                  version.
                * testsuite/misc-ming.all/: frame_label_test.c, 
path_format_test.c:
                  use CALLFRAME instead of callFrame.
        
        (make check should work again with Ming head now)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4670&r2=1.4671
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/frame_label_test.c?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/path_format_test.c?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4670
retrieving revision 1.4671
diff -u -b -r1.4670 -r1.4671
--- ChangeLog   22 Oct 2007 19:53:34 -0000      1.4670
+++ ChangeLog   23 Oct 2007 07:23:03 -0000      1.4671
@@ -1,3 +1,11 @@
+2007-10-23 Sandro Santilli <address@hidden>
+
+       * testsuite/misc-ming.all/ming_utils.h: provide a CALLFRAME
+         macro to use the syntax recognized by the detected Ming
+         version.
+       * testsuite/misc-ming.all/: frame_label_test.c, path_format_test.c:
+         use CALLFRAME instead of callFrame.
+
 2007-10-22 Sandro Santilli <address@hidden>
 
        * server/movie_root.{cpp,h}: don't update viewport size on setLevel,

Index: testsuite/misc-ming.all/frame_label_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/frame_label_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/frame_label_test.c  1 Jul 2007 10:54:53 -0000       
1.3
+++ testsuite/misc-ming.all/frame_label_test.c  23 Oct 2007 07:23:04 -0000      
1.4
@@ -121,9 +121,9 @@
                   " gotoAndPlay(lable); "           //GotoExpression
                   " lable = '/mc1/mc11/:5'; "
                   " gotoAndPlay(lable); "           //GotoExpression
-                  " callFrame('/mc1/mc11/:frame6'); "
-                  " callFrame('mc1:7'); "
-                  " callFrame('mc1/:frame8'); ");      
+                  " "CALLFRAME"('/mc1/mc11/:frame6'); "
+                  " "CALLFRAME"('mc1:7'); "
+                  " "CALLFRAME"('mc1/:frame8'); ");      
                   
   SWFMovie_nextFrame(mo); /* 3rd frame of _root */
    
@@ -139,7 +139,7 @@
   check_equals(mo, "_root.x4", "0");
   check_equals(mo, "_root.x5", "0");
   check_equals(mo, "_root.x6", "0");
-  add_actions(mo, " callFrame('/:1'); ");
+  add_actions(mo, " "CALLFRAME"('/:1'); ");
   check_equals(mo, "_root.x1", "0");
   check_equals(mo, "_root.x2", "0");
   check_equals(mo, "_root.x3", "0");

Index: testsuite/misc-ming.all/ming_utils.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- testsuite/misc-ming.all/ming_utils.h        7 Jul 2007 20:27:14 -0000       
1.22
+++ testsuite/misc-ming.all/ming_utils.h        23 Oct 2007 07:23:04 -0000      
1.23
@@ -48,6 +48,18 @@
 # define newSWFAction compileSWFActionCode
 #endif
 
+/*
+ * 'callFrame' was drop as a keyword since Ming-0.4.0.beta5
+ * and replaced by 'call'. Before that version 'call' would
+ * never be recognized as a "callframe" action
+ */
+#if MING_VERSION_CODE >= 00040006
+# define CALLFRAME "call"
+#else
+# define CALLFRAME "callFrame"
+#endif
+
+
 /* Missing define to allow using older Ming releases */
 
 #ifndef SWFACTION_INIT

Index: testsuite/misc-ming.all/path_format_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/path_format_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/path_format_test.c  1 Jul 2007 10:54:59 -0000       
1.2
+++ testsuite/misc-ming.all/path_format_test.c  23 Oct 2007 07:23:04 -0000      
1.3
@@ -237,31 +237,30 @@
   /* Notice that _root.3.1 is not even displayed on screen 
      with all versions. accessing _root.3.1 failed! */
   check_equals(mo, "_root.x10", "'undefined'" ); 
-  
-  add_actions(mo, "callFrame('/mc1/mc11/:4');");
+  add_actions(mo, CALLFRAME"('/mc1/mc11/:4');");
   /* the above path format is supported */
   check_equals(mo, "_root.x1", "'mc11_frame4'" ); 
   
   /* reset _root.x1 to 0*/
   add_actions(mo, "_root.x1 = 0;");
-  add_actions(mo, "callFrame('_root.mc1.mc11.4');");
+  add_actions(mo, CALLFRAME"('_root.mc1.mc11.4');");
   /* the above path format is supported */
   check_equals(mo, "_root.x1", "'mc11_frame4'" ); 
 
   /* reset _root.x1 to 0*/
   add_actions(mo, "_root.x1 = 0;");
-  add_actions(mo, "callFrame('_root.mc1.mc11:4');");
+  add_actions(mo, CALLFRAME"('_root.mc1.mc11:4');");
   /* the above path format is supported */
   check_equals(mo, "_root.x1", "'mc11_frame4'" ); 
   
   /* reset _root.x1 to 0*/
   add_actions(mo, "_root.x1 = 0;");
-  add_actions(mo, "callFrame('/mc1/mc11/4');");
+  add_actions(mo, CALLFRAME"('/mc1/mc11/4');");
   /* the above path format is not supported */
   check_equals(mo, "_root.x1", "0" ); 
 
   /* reset _root.x1~10 to 0 */
-  add_actions(mo, "callFrame('/:1');");
+  add_actions(mo, CALLFRAME"('/:1');");
  
   /* test valid path format for ActionGotoExpression */
   add_actions(mo, " path = '/mc1/mc11/4'; "        // not supported