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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/01 10:03:25

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am 
                                 action_execution_order_test8.c 

Log message:
                * testsuite/misc-ming.all/: Makefile.am,
                  action_execution_order_test8.c: build the test in SWF5 and 
SWF6
                  version, to verify opcode guard being is not dependent on 
version
                  (well, at least not on those two versions, SWF5 including
                  curveball.swf).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4489&r2=1.4490
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.156&r2=1.157
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_test8.c?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4489
retrieving revision 1.4490
diff -u -b -r1.4489 -r1.4490
--- ChangeLog   1 Oct 2007 09:07:23 -0000       1.4489
+++ ChangeLog   1 Oct 2007 10:03:24 -0000       1.4490
@@ -1,5 +1,13 @@
 2007-09-30 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/: Makefile.am,
+         action_execution_order_test8.c: build the test in SWF5 and SWF6 
+         version, to verify opcode guard being is not dependent on version
+         (well, at least not on those two versions, SWF5 including
+         curveball.swf).
+
+2007-09-30 Sandro Santilli <address@hidden>
+
        * testsuite/misc-swfc.all/opcode_guard_test2.sc: test that unloaded
          but still not removed current target is still used for finding
          variables.

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- testsuite/misc-ming.all/Makefile.am 27 Sep 2007 23:59:56 -0000      1.156
+++ testsuite/misc-ming.all/Makefile.am 1 Oct 2007 10:03:25 -0000       1.157
@@ -1283,11 +1283,14 @@
        $(NULL)
 action_execution_order_test8_LDADD = libgnashmingutils.la
 
-action_execution_order_test8.swf: action_execution_order_test8
-       ./action_execution_order_test8 $(top_srcdir)/testsuite/media
+action_execution_order_test8-v6.swf: action_execution_order_test8
+       ./action_execution_order_test8 $(top_srcdir)/testsuite/media 6
 
-action_execution_order_test8runner: $(srcdir)/../generic-testrunner.sh 
action_execution_order_test8.swf
-       sh $< -f8 $(top_builddir) action_execution_order_test8.swf > $@
+action_execution_order_test8-v5.swf: action_execution_order_test8
+       ./action_execution_order_test8 $(top_srcdir)/testsuite/media 5
+
+action_execution_order_test8runner: $(srcdir)/../generic-testrunner.sh 
action_execution_order_test8-v5.swf action_execution_order_test8-v6.swf
+       sh $< -f8 $(top_builddir) action_execution_order_test8-v5.swf 
action_execution_order_test8-v6.swf > $@
        chmod 755 $@
 
 action_execution_order_test9_SOURCES = \

Index: testsuite/misc-ming.all/action_execution_order_test8.c
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/action_execution_order_test8.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-ming.all/action_execution_order_test8.c      27 Sep 2007 
08:10:17 -0000      1.9
+++ testsuite/misc-ming.all/action_execution_order_test8.c      1 Oct 2007 
10:03:25 -0000       1.10
@@ -50,8 +50,8 @@
 
 #include "ming_utils.h"
 
-#define OUTPUT_VERSION 6
-#define OUTPUT_FILENAME "action_execution_order_test8.swf"
+#define DEF_OUTPUT_VERSION 6
+#define OUTPUT_FILENAME_FMT "action_execution_order_test8-v%d.swf"
 
 
 int
@@ -60,10 +60,14 @@
   SWFMovie mo;
   SWFMovieClip  mc1, mc2, dejagnuclip;
   SWFDisplayItem it1, it2;
+  int outputVersion = DEF_OUTPUT_VERSION;
   
   const char *srcdir=".";
   if ( argc>1 ) 
+  {
     srcdir=argv[1];
+    if ( argc>2 ) outputVersion = atoi(argv[2]);
+  }
   else
   {
       fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
@@ -71,7 +75,7 @@
   }
 
   Ming_init();
-  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  mo = newSWFMovieWithVersion(outputVersion);
   SWFMovie_setDimension(mo, 800, 600);
   SWFMovie_setRate (mo, 12.0);
 
@@ -142,8 +146,10 @@
 
   SWFMovie_nextFrame(mo); /* 6th frame */
   //Output movie
-  puts("Saving " OUTPUT_FILENAME );
-  SWFMovie_save(mo, OUTPUT_FILENAME);
+  char outputFilename[256];
+  snprintf(outputFilename, 255, OUTPUT_FILENAME_FMT, outputVersion);
+  printf("Saving %s\n", outputFilename );
+  SWFMovie_save(mo, outputFilename);
 
   return 0;
 }