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

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: Makefile.am check.as 
        testsuite/misc-ming.all: Makefile.am 
Added files:
        testsuite/actionscript.all: dejagnu_so_fini.as 
                                    dejagnu_so_init.as 

Log message:
                * testsuite/misc-ming.all/Makefile.am: build Dejagnu.swf
                  on 'make check'
                * testsuite/actionscript.all/: dejagnu_so_fini.as,
                  dejagnu_so_init.as:
                  New wrappers around Dejagnu.swf shared library to make
                  it's use effective.
                * testsuite/actionscript.all/check.as: use Dejagnu.swf
                  shared library if USE_DEJAGNU_MODULE is defined, provide
                  fallback to bare 'trace' if it is not-working (due to bogus
                  'makeswf' found in Ming-0.4.0beta22. Obsolete USE_XTRACE.     
                * testsuite/actionscript.all/Makefile.am: change *.swf rule
                  to use the Dejagnu.swf module (includes defining 
USE_DEJAGNU_MODULE
                  and wrapping source in dejagnu_so_init.as and 
dejagnu_so_fini.as.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1627&r2=1.1628
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/check.as?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/dejagnu_so_fini.as?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/dejagnu_so_init.as?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1627
retrieving revision 1.1628
diff -u -b -r1.1627 -r1.1628
--- ChangeLog   16 Nov 2006 08:54:51 -0000      1.1627
+++ ChangeLog   16 Nov 2006 10:53:20 -0000      1.1628
@@ -1,5 +1,21 @@
 2006-11-16 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/Makefile.am: build Dejagnu.swf
+         on 'make check'
+       * testsuite/actionscript.all/: dejagnu_so_fini.as,
+         dejagnu_so_init.as:
+         New wrappers around Dejagnu.swf shared library to make
+         it's use effective.
+       * testsuite/actionscript.all/check.as: use Dejagnu.swf
+         shared library if USE_DEJAGNU_MODULE is defined, provide
+         fallback to bare 'trace' if it is not-working (due to bogus
+         'makeswf' found in Ming-0.4.0beta22. Obsolete USE_XTRACE.
+       * testsuite/actionscript.all/Makefile.am: change *.swf rule
+         to use the Dejagnu.swf module (includes defining USE_DEJAGNU_MODULE
+         and wrapping source in dejagnu_so_init.as and dejagnu_so_fini.as.
+
+2006-11-16 Sandro Santilli <address@hidden>
+
        * macros/agg.m4: don't assume AGG is installed
          if agg_gradient_lut.h is not found.
 

Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- testsuite/actionscript.all/Makefile.am      5 Nov 2006 00:45:27 -0000       
1.42
+++ testsuite/actionscript.all/Makefile.am      16 Nov 2006 10:53:20 -0000      
1.43
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.42 2006/11/05 00:45:27 rsavoye Exp $
+# $Id: Makefile.am,v 1.43 2006/11/16 10:53:20 strk Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -89,7 +89,10 @@
        text_formatting.swf \
        text_sizes.swf \
        visible_and_transparency.swf \
-       swf_exists.exp
+       swf_exists.exp \
+       dejagnu_so_fini.as \
+       dejagnu_so_init.as \
+       $(NULL)
 
 if ENABLE_MING
 TARGET = $(GENERATED)
@@ -145,15 +148,15 @@
 test: $(GENERATED)
        gnash -1 -r 0 -v $(GENERATED)
 
-# To use XTRACE output:
-#  MAKESWF_FLAGS=-DUSE_XTRACE make Whatever.swf
-# or use the Whatever.vswf rule
-.as.swf: check.as
+# Wrap the .as test in dejagnu_so importer, Dejagnu.swf needs to exist
+# in ../ming-misc.all/
+#
+.as.swf: check.as dejagnu_so_init.as dejagnu_so_fini.as 
../misc-ming.all/Dejagnu.swf
        @if test x"$(MAKESWF)" != x; then \
          if test x"$(SWFVERSION)" = x; then \
           SWFVERSION="6" make $@; \
          else \
-          $(MAKESWF) -DOUTPUT_VERSION=$(SWFVERSION) -v$(SWFVERSION) 
$(MAKESWF_FLAGS) -o $@ $< ; \
+          $(MAKESWF) -i../misc-ming.all/Dejagnu.swf:dejagnu 
-DUSE_DEJAGNU_MODULE -DOUTPUT_VERSION=$(SWFVERSION) -v$(SWFVERSION) 
$(MAKESWF_FLAGS) -o $@ $(srcdir)/dejagnu_so_init.as $< 
$(srcdir)/dejagnu_so_fini.as; \
          fi; \
        else \
          echo "You need to install Ming to compile"; \

Index: testsuite/actionscript.all/check.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/check.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/actionscript.all/check.as 29 Oct 2006 18:34:18 -0000      1.10
+++ testsuite/actionscript.all/check.as 16 Nov 2006 10:53:20 -0000      1.11
@@ -29,8 +29,22 @@
 
 // Define USE_XTRACE to use "visual" trace
 #ifdef USE_XTRACE
-# include "xtrace.as"
-# define trace xtrace
+// This is obsoleted, use USE_DEJAGNU_MODULE insted
+//# include "xtrace.as"
+//# define trace xtrace
+#define USE_DEJAGNU_MODULE 1
+#endif
+
+// Use facilities provided by dejagnu shared library module
+//
+// NOTE: if you define USE_DEJAGNU_MODULE you
+//       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
+# define trace(x) if ( xtrace ) xtrace(x); else trace(x)
 #endif
 
 // Define USE_RTRACE to use "report" trace

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- testsuite/misc-ming.all/Makefile.am 16 Nov 2006 00:35:32 -0000      1.33
+++ testsuite/misc-ming.all/Makefile.am 16 Nov 2006 10:53:20 -0000      1.34
@@ -48,6 +48,7 @@
        DefineEditTextVariableNameTest \
        DefineEditTextVariableNameTest-Runner \
        Dejagnu \
+       Dejagnu.swf \
        RollOverOutTest-Runner \
        ButtonEventsTest-Runner \
        spritehier \

Index: testsuite/actionscript.all/dejagnu_so_fini.as
===================================================================
RCS file: testsuite/actionscript.all/dejagnu_so_fini.as
diff -N testsuite/actionscript.all/dejagnu_so_fini.as
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/actionscript.all/dejagnu_so_fini.as       16 Nov 2006 10:53:20 
-0000      1.1
@@ -0,0 +1,13 @@
+// NOTE: when using ming-0.4.0-beta, a bug in 'makeswf' will
+//       prevent __shared_assets clip to work (the movieclip
+//       will be published with a frame-count of 0, thus
+//       actions in it will *NOT* be executed)
+
+// Print totals
+totals();
+
+// Since we movies importing Dejagnu.swf need
+// to be multiframed (actions in first frame will
+// be executed *before* actions in imported Dejagnu.swf)
+// we need a stop here, or we'll keep looping.
+stop();

Index: testsuite/actionscript.all/dejagnu_so_init.as
===================================================================
RCS file: testsuite/actionscript.all/dejagnu_so_init.as
diff -N testsuite/actionscript.all/dejagnu_so_init.as
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/actionscript.all/dejagnu_so_init.as       16 Nov 2006 10:53:20 
-0000      1.1
@@ -0,0 +1,10 @@
+
+// NOTE: when using ming-0.4.0-beta, a bug in 'makeswf' will
+//       prevent __shared_assets clip to work (the movieclip
+//       will be published with a frame-count of 0, thus
+//       actions in it will *NOT* be executed)
+
+
+// By default 'makeswf' makes the __shared_assets clip invisible,
+// make it visible to *see* visual traces
+__shared_assets._visible = true;