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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/18 13:40:45

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

Log message:
                * testsuite/misc-ming.all/: Makefile.am, timeline_var_test.c:
                  added Dejagnu.swf capabilities (for visual debugging).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1963&r2=1.1964
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/timeline_var_test.c?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1963
retrieving revision 1.1964
diff -u -b -r1.1963 -r1.1964
--- ChangeLog   18 Dec 2006 12:57:53 -0000      1.1963
+++ ChangeLog   18 Dec 2006 13:40:45 -0000      1.1964
@@ -1,5 +1,10 @@
 2006-12-18 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/: Makefile.am, timeline_var_test.c:
+         added Dejagnu.swf capabilities (for visual debugging).
+
+2006-12-18 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/dejagnu_so_init.as: fix removal
          of onEnterFrame callback (don't use 'this').
        * testsuite/misc-ming.all/Makefile.am: enabled

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- testsuite/misc-ming.all/Makefile.am 18 Dec 2006 11:31:55 -0000      1.41
+++ testsuite/misc-ming.all/Makefile.am 18 Dec 2006 13:40:45 -0000      1.42
@@ -135,7 +135,7 @@
 timeline_var_test_LDADD = $(MING_LIBS)
 
 timeline_var_test.swf: timeline_var_test
-       ./timeline_var_test 
+       ./timeline_var_test $(top_srcdir)/testsuite/media
 
 timeline_var_test-Runner: $(srcdir)/../generic-testrunner.sh 
timeline_var_test.swf
        sh $< $(top_builddir) timeline_var_test.swf > $@

Index: testsuite/misc-ming.all/timeline_var_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/timeline_var_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/timeline_var_test.c 18 Dec 2006 09:36:58 -0000      
1.2
+++ testsuite/misc-ming.all/timeline_var_test.c 18 Dec 2006 13:40:45 -0000      
1.3
@@ -26,6 +26,8 @@
  ***********************************************************************/
 
 
+#include "ming_utils.h"
+
 #include <stdio.h>
 #include <ming.h>
 
@@ -50,16 +52,16 @@
      if(loop_back == 0) \
      { \
         if ( var_at_frame3 == undefined ) \
-            trace(\"PASSED: var_at_frame3 == undefined \" ); \
+            _root.pass(\"var_at_frame3 == undefined \" ); \
         else \
-            trace(\"FAILED: var_at_frame3 == undefined \" ); \
+            _root.fail(\"var_at_frame3 == undefined \" ); \
      } \
      else \
      { \
          if ( var_at_frame3 == \"var_defined_at_frame3\" ) \
-             trace(\"XPASSED: var_at_frame3 == var_defined_at_frame3\" ); \
+             _root.xpass(\"var_at_frame3 == var_defined_at_frame3\" ); \
          else \
-             trace(\"XFAILED: var_at_frame3 == var_defined_at_frame3\" ); \
+             _root.xfail(\"var_at_frame3 == var_defined_at_frame3\" ); \
      } \
   ");
   return ac;
@@ -79,19 +81,33 @@
   SWFAction ac;
   ac = compileSWFActionCode(" \
     if ( ++loop_back < 2 ) gotoAndPlay(2); \
+    else { _root.totals(); stop(); } \
   " );
   return ac;
 }
 
 
-int main()
+int main(int argc, char** argv)
 {
   SWFMovie  movie;
+  SWFMovieClip dejagnuclip;
   SWFAction ac[FRAME_COUNT];
   int i;
+  const char *srcdir=".";
+
+  if ( argc>1 ) srcdir=argv[1];
+  else
+  {
+    fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+    return 1;
+  }
 
   Ming_init();
   movie = newSWFMovie();
+  SWFMovie_setDimension(movie, 800, 600);
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 
800, 600);
+  SWFMovie_add(movie, (SWFBlock)dejagnuclip);
 
   // Add frame ActionScipts to frames
   ac[0] = action_in_frame1();