[Gnash-commit] gnash ChangeLog doc/C/internals.xml testsuite/g...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/16 12:31:03

Modified files:
        .              : ChangeLog 
        doc/C          : internals.xml 
        testsuite      : generic-testrunner.sh 
        testsuite/misc-ming.all: Makefile.am get_frame_number_test.c 
        testsuite/server: Makefile.am 

Log message:
                * testsuite/server/Makefile.am: add libgnashamf.la to GNASH 
libs.
                * testsuite/generic-testrunner.sh, doc/C/internals.xml:
                  Add -f switch to specify the maximum number of frame 
advancements.
                * testsuite/misc-ming.all/Makefile.am: update
                  get_frame_number_testrunner to advance at most 20 times.
                * testsuite/misc-ming.all/get_frame_number_test.c: no more 
failures
                  expected.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2887&r2=1.2888
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/internals.xml?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/generic-testrunner.sh?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/get_frame_number_test.c?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2887
retrieving revision 1.2888
diff -u -b -r1.2887 -r1.2888
--- ChangeLog   16 Apr 2007 11:19:48 -0000      1.2887
+++ ChangeLog   16 Apr 2007 12:31:01 -0000      1.2888
@@ -1,5 +1,12 @@
 2007-04-16 Sandro Santilli <address@hidden>
 
+       * testsuite/server/Makefile.am: add libgnashamf.la to GNASH libs.
+       * testsuite/generic-testrunner.sh, doc/C/internals.xml:
+         Add -f switch to specify the maximum number of frame advancements.
+       * testsuite/misc-ming.all/Makefile.am: update
+         get_frame_number_testrunner to advance at most 20 times.
+       * testsuite/misc-ming.all/get_frame_number_test.c: no more failures
+         expected.
        * server/sprite_instance.cpp (get_frame_number): check frame labels
          also when convertion to number gives a non-integer value.
        * server/vm/ASHandlers.cpp (ActionGotoExpression): don't pretend

Index: doc/C/internals.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/internals.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- doc/C/internals.xml 12 Apr 2007 08:55:53 -0000      1.62
+++ doc/C/internals.xml 16 Apr 2007 12:31:02 -0000      1.63
@@ -1031,6 +1031,18 @@
        </programlisting>
        </para>
 
+       <para>
+       In case your test movie stops before the last frame, or you want to 
control the
+       exact number of times to call the frame advancement routine, you can 
use the 
+       -f switch to control that.
+       <programlisting>
+MyTest-Runner: $(srcdir)/../generic-testrunner.sh MyTest.swf
+        sh $(srcdir)/../generic-testrunner.sh -f10 $(top_builddir) MyTest.swf 
> $@
+        chmod +x $@
+       </programlisting>
+       When both -f and -r are given, the first exit condition reached will 
take effect.
+       </para>
+
        </sect4>
        
        <sect4 id="writing_movie_testers">

Index: testsuite/generic-testrunner.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/generic-testrunner.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/generic-testrunner.sh     23 Jan 2007 18:02:45 -0000      1.6
+++ testsuite/generic-testrunner.sh     16 Apr 2007 12:31:02 -0000      1.7
@@ -18,11 +18,13 @@
 # 
 
 runs=1
+advances=0
 
-while getopts r: name; do
+while getopts r:f: name; do
        case $name in
                r) runs="$OPTARG" ;;
-               ?) echo "Usage: $0 [-r <runs>] <swf> ..." >&2;
+               f) advances="$OPTARG" ;;
+               ?) echo "Usage: $0 [-r <runs>] [-f <advances>] <swf> ..." >&2;
                   exit 1;;
        esac
 done
@@ -36,6 +38,6 @@
 #!/bin/sh
 for t in ${testfiles}; do
        echo "NOTE: Running test \${t}"
-       ${top_builddir}/utilities/gprocessor -r${runs} -v \${t} || echo 
"FAILED: gprocessor returned an error while playing '\${t}'"
+       ${top_builddir}/utilities/gprocessor -r${runs} -f${advances} -v \${t} 
|| echo "FAILED: gprocessor returned an error while playing '\${t}'"
 done
 EOF

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- testsuite/misc-ming.all/Makefile.am 16 Apr 2007 06:23:21 -0000      1.92
+++ testsuite/misc-ming.all/Makefile.am 16 Apr 2007 12:31:02 -0000      1.93
@@ -400,7 +400,7 @@
        ./get_frame_number_test $(top_srcdir)/testsuite/media
 
 get_frame_number_testrunner: $(srcdir)/../generic-testrunner.sh 
get_frame_number_test.swf
-       sh $< -r5 $(top_builddir) get_frame_number_test.swf > $@
+       sh $< -f20 $(top_builddir) get_frame_number_test.swf > $@
        chmod 755 $@
 
 frame_label_test_SOURCES =     \

Index: testsuite/misc-ming.all/get_frame_number_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/get_frame_number_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/get_frame_number_test.c     16 Apr 2007 09:43:13 
-0000      1.2
+++ testsuite/misc-ming.all/get_frame_number_test.c     16 Apr 2007 12:31:02 
-0000      1.3
@@ -84,10 +84,10 @@
   check_equals(mo, "_currentframe", "2");  
   add_actions(mo, " x = 4.8; "  // valid frame label                   
                   " gotoAndStop(x); ");         // ActionGotoExpression  
-  xcheck_equals(mo, "_currentframe", "5");          
+  check_equals(mo, "_currentframe", "5");          
   add_actions(mo, " x = 6.1; "  // invalid frame number                   
                   " gotoAndStop(x); ");         // ActionGotoExpression  
-  xcheck_equals(mo, "_currentframe", "5"); 
+  check_equals(mo, "_currentframe", "5"); 
   add_actions(mo, " gotoAndStop(7); ");         // ActionGotoFrame
   SWFMovie_nextFrame(mo); /* 6th frame */
   
@@ -136,7 +136,7 @@
   
   add_actions(mo, " gotoAndStop(x4); ");             // ActionGotoExpression
   /* "4.8" is a valid frame label, toString() invoked */
-  xcheck_equals(mo, "_currentframe", "5");
+  check_equals(mo, "_currentframe", "5");
   
   add_actions(mo, " _root.totals(); stop(); ");
   SWFMovie_nextFrame(mo); /* 7th frame */

Index: testsuite/server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/server/Makefile.am        31 Mar 2007 21:16:49 -0000      1.25
+++ testsuite/server/Makefile.am        16 Apr 2007 12:31:02 -0000      1.26
@@ -48,49 +48,38 @@
        gnash-dbg.log \
        $(NULL)
 
-MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = \
+GNASH_LIBS = \
        $(top_builddir)/server/libgnashserver.la \
        $(top_builddir)/server/parser/libgnashparser.la \
        $(top_builddir)/server/asobj/libgnashasobjs.la \
        $(top_builddir)/server/vm/libgnashvm.la \
        $(top_builddir)/libbase/libgnashbase.la \
+       $(top_builddir)/libamf/libgnashamf.la \
+       $(NULL)
+
+MatrixTest_SOURCES = MatrixTest.cpp
+MatrixTest_LDADD = \
+       $(GNASH_LIBS) \
        $(NULL)
 
 PropertyListTest_SOURCES = PropertyListTest.cpp
 PropertyListTest_LDADD = \
-       $(top_builddir)/server/libgnashserver.la \
-       $(top_builddir)/server/parser/libgnashparser.la \
-       $(top_builddir)/server/asobj/libgnashasobjs.la \
-       $(top_builddir)/server/vm/libgnashvm.la \
-       $(top_builddir)/libbase/libgnashbase.la \
+       $(GNASH_LIBS) \
        $(NULL)
 
 GetterSetterTest_SOURCES = GetterSetterTest.cpp
 GetterSetterTest_LDADD = \
-       $(top_builddir)/server/libgnashserver.la \
-       $(top_builddir)/server/parser/libgnashparser.la \
-       $(top_builddir)/server/asobj/libgnashasobjs.la \
-       $(top_builddir)/server/vm/libgnashvm.la \
-       $(top_builddir)/libbase/libgnashbase.la \
+       $(GNASH_LIBS) \
        $(NULL)
 
 as_prop_flagsTest_SOURCES = as_prop_flagsTest.cpp
 as_prop_flagsTest_LDADD = \
-       $(top_builddir)/server/libgnashserver.la \
-       $(top_builddir)/server/asobj/libgnashasobjs.la \
-       $(top_builddir)/server/parser/libgnashparser.la \
-       $(top_builddir)/server/vm/libgnashvm.la \
-       $(top_builddir)/libbase/libgnashbase.la \
+       $(GNASH_LIBS) \
        $(NULL)
 
 DisplayListTest_SOURCES = DisplayListTest.cpp
 DisplayListTest_LDADD = \
-       $(top_builddir)/server/libgnashserver.la \
-       $(top_builddir)/server/asobj/libgnashasobjs.la \
-       $(top_builddir)/server/parser/libgnashparser.la \
-       $(top_builddir)/server/vm/libgnashvm.la \
-       $(top_builddir)/libbase/libgnashbase.la \
+       $(GNASH_LIBS) \
        $(NULL)
 
 TEST_DRIVERS = ../simple.exp