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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/30 23:48:59

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

Log message:
                * testsuite/misc-ming.all/: Makefile.am,
                  place_and_remove_object_test.c:
                  turned last testcase into a self-contained
                  one.
        
        (The ChangeLog entry was erroneously committed before)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2019&r2=1.2020
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/place_and_remove_object_test.c?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2019
retrieving revision 1.2020
diff -u -b -r1.2019 -r1.2020
--- ChangeLog   30 Dec 2006 23:41:42 -0000      1.2019
+++ ChangeLog   30 Dec 2006 23:48:59 -0000      1.2020
@@ -1,5 +1,9 @@
 2006-12-30 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/: Makefile.am,
+         place_and_remove_object_test.c: 
+         turned last testcase into a self-contained
+         one.
        * doc/C/internals.xml: updated section about writing Ming-based
          self-contained tests.
        * testsuite/misc-ming.all/ming_utils.{h,c}:
@@ -16,10 +20,6 @@
          restart conditions).
        * utilities/processor.cpp: add -r switch to control
          allowed number of runs (restarts).
-       * testsuite/misc-ming.all/: Makefile.am,
-         place_and_remove_object_test.c: 
-         turned last testcase into a self-contained
-         one.
 
 2006-12-30 Sandro Santilli <address@hidden>
 

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- testsuite/misc-ming.all/Makefile.am 30 Dec 2006 10:11:30 -0000      1.48
+++ testsuite/misc-ming.all/Makefile.am 30 Dec 2006 23:48:59 -0000      1.49
@@ -71,6 +71,7 @@
 check_SCRIPTS = \
        VarAndCharClashTest-Runner \
        timeline_var_test-Runner \
+       place_and_remove_object_testrunner \
        $(NULL)
 
 # TESTS = \
@@ -227,6 +228,10 @@
 place_and_remove_object_test.swf: place_and_remove_object_test
        ./place_and_remove_object_test $(top_srcdir)/testsuite/media
 
+place_and_remove_object_testrunner: $(srcdir)/../generic-testrunner.sh 
place_and_remove_object_test.swf
+       sh $< -r5 $(top_builddir) place_and_remove_object_test.swf > $@
+       chmod 755 $@
+
 spritehier.swf: spritehier
        ./spritehier
 
@@ -304,6 +309,7 @@
        root_stop_testrunner \
        loop_test-Runner \
        place_object_testrunner \
+       place_and_remove_object_testrunner \
        $(NULL)
 
 

Index: testsuite/misc-ming.all/place_and_remove_object_test.c
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/place_and_remove_object_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/place_and_remove_object_test.c      30 Dec 2006 
10:11:30 -0000      1.1
+++ testsuite/misc-ming.all/place_and_remove_object_test.c      30 Dec 2006 
23:48:59 -0000      1.2
@@ -43,10 +43,8 @@
 main(int argc, char** argv)
 {
        SWFMovie mo;
-       SWFMovieClip mc1, mc2, dejagnuclip;
+       SWFMovieClip dejagnuclip;
        SWFShape  sh1,sh2;
-       SWFAction ac1, ac2;
-       int i;
 
        const char *srcdir=".";
        if ( argc>1 ) 
@@ -61,8 +59,8 @@
        mo = newSWFMovieWithVersion(OUTPUT_VERSION);
        SWFMovie_setDimension(mo, 800, 600);
 
-       //dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 
10, 0, 0, 800, 600);
-       //SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+       dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 
0, 0, 800, 600);
+       SWFMovie_add(mo, (SWFBlock)dejagnuclip);
        //SWFMovie_nextFrame(mo); 
 
 
@@ -73,13 +71,22 @@
        SWFDisplayItem it;
        it = SWFMovie_add(mo, (SWFBlock)sh1);  //add a red square to the 1st 
frame at depth 3
        SWFDisplayItem_setDepth(it, 3); 
+       SWFDisplayItem_setName(it, "sh1");
+       xcheck(mo, "_root.sh1 != undefined");
+       xcheck_equals(mo, "_root.sh2",  "undefined");
        SWFMovie_nextFrame(mo);        
        
        SWFMovie_remove(mo, it);          //remove the red square at the 2nd 
frame
+       check_equals(mo, "_root.sh1",  "undefined");
+       check_equals(mo, "_root.sh2",  "undefined");
        SWFMovie_nextFrame(mo);       
        
        it = SWFMovie_add(mo, (SWFBlock)sh2);  //add a black square to the 3rd 
frame at depth 3
        SWFDisplayItem_setDepth(it, 3); 
+       SWFDisplayItem_setName(it, "sh2");
+       check_equals(mo, "_root.sh1",  "undefined");
+       check(mo, "_root.sh2 != undefined");
+       add_actions(mo, "if ( ++counter > 1 ) { _root.totals(); stop(); }");
        SWFMovie_nextFrame(mo);        
 
        //Output movie