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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/21 11:21:55

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: NetStream-SquareTest.c 

Log message:
        fix the test for number of onMetaData invocations (gnash gst fails).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6662&r2=1.6663
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/NetStream-SquareTest.c?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6662
retrieving revision 1.6663
diff -u -b -r1.6662 -r1.6663
--- ChangeLog   21 May 2008 09:08:57 -0000      1.6662
+++ ChangeLog   21 May 2008 11:21:54 -0000      1.6663
@@ -1,3 +1,8 @@
+2008-05-21 Sandro Santilli <address@hidden>
+
+       * testsuite/misc-ming.all/NetStream-SquareTest.c: fix the test
+         for number of onMetaData invocations (gnash gst fails).
+
 2008-05-21 Benjamin Wolsey <address@hidden>
 
        * gui/Player.cpp: comment on <unistd.h> include.

Index: testsuite/misc-ming.all/NetStream-SquareTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/NetStream-SquareTest.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- testsuite/misc-ming.all/NetStream-SquareTest.c      12 May 2008 09:12:21 
-0000      1.30
+++ testsuite/misc-ming.all/NetStream-SquareTest.c      21 May 2008 11:21:55 
-0000      1.31
@@ -352,12 +352,14 @@
                " }"
                " _root.note('onMetaData: '+s);"
 
+
+               " _root.metadataNotified++;"
+
                // don't run other tests if already done
                // BTW: should be called once, gnash (gst) calls this twice
                //      and would succeed in composition checking in second 
call.
-               " if ( _root.metadataNotified ) return;"
+               " if ( _root.metadataNotified > 1 ) return;"
 
-               " _root.metadataNotified++;"
                " xcheck(_root.startNotified, 'onMetaData should be notified 
after Play.Start');"
                " check_equals(arguments.length, 1, 'single argument');"
                " check(info instanceof Object, 'onMetaData argument should be 
instanceof Object');"
@@ -461,7 +463,7 @@
 
   SWFMovie_nextFrame(mo);
 
-  check_equals(mo, "metadataNotified", "1");
+  xcheck_equals(mo, "metadataNotified", "1");
   check_equals(mo, "stopNotified", "2");
   check_equals(mo, "startNotified", "1");
   SWFMovie_add(mo, (SWFBlock)newSWFAction("totals(119); stop();"));