[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-484-gc86d695

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  c86d6958ba131d71963c0d7bb36162e76ec6e537 (commit)
      from  49ff7d7465a2c3137277564fb55bb639157e320f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=c86d6958ba131d71963c0d7bb36162e76ec6e537


commit c86d6958ba131d71963c0d7bb36162e76ec6e537
Author: Sandro Santilli <address@hidden>
Date:   Wed Jul 13 19:06:09 2011 +0200

    Review and cleanup InitActionTest2.c
    
    The test seems to cover lots of cases, does it mean the comments in
    DoInitActionTag.h are outdated ?

diff --git a/testsuite/misc-ming.all/init_action/InitActionTest2.c 
b/testsuite/misc-ming.all/init_action/InitActionTest2.c
index d10961c..0df0e9b 100644
--- a/testsuite/misc-ming.all/init_action/InitActionTest2.c
+++ b/testsuite/misc-ming.all/init_action/InitActionTest2.c
@@ -58,7 +58,7 @@ main(int argc, char** argv)
     SWFMovieClip_nextFrame(mc4);
     it = SWFMovie_add(mo, (SWFBlock)mc4);
 
-    // InitActions for ID 2 parsed here:
+    // InitActions for ID 4 parsed here:
     ia = newSWFInitAction_withId(
             newSWFAction("trace('mc4'); _global.val4 = 'mc4';"), 4);
     SWFMovie_add(mo, (SWFBlock)ia);
@@ -69,40 +69,40 @@ main(int argc, char** argv)
     SWFMovie_add(mo, (SWFBlock)ia);
 
     // Check in first frame:
-    check(mo, "_global.val4 == undefined");
+    check_equals(mo, "_global.val4", "undefined");
 
     // Frame 2
     SWFMovie_nextFrame(mo);
     
     // Check in next frame:
-    check(mo, "_global.val4 == undefined");
+    check_equals(mo, "_global.val4", "undefined");
     
     // Frame 3
     SWFMovie_nextFrame(mo);
 
     // Action is before export tag.
-    check(mo, "_global.val4 == undefined");
+    check_equals(mo, "_global.val4", "undefined");
     SWFMovie_addExport(mo, (SWFBlock)mc4, "export4");
     SWFMovie_writeExports(mo);
-    check(mo, "_global.val4 == undefined");
+    check_equals(mo, "_global.val4", "undefined");
 
     // Frame 4
     SWFMovie_nextFrame(mo);
-    check(mo, "_global.val4 == undefined");
+    check_equals(mo, "_global.val4", "undefined");
 
     // Add it again
     SWFMovie_add(mo, (SWFBlock)mc4);
-    check(mo, "_global.val4 == undefined");
+    check_equals(mo, "_global.val4", "undefined");
 
     // Frame 5
     SWFMovie_nextFrame(mo);
-    check(mo, "_global.val4 == undefined");
+    check_equals(mo, "_global.val4", "undefined");
     
     // Add it again, export it again:
     SWFMovie_add(mo, (SWFBlock)mc4);
     SWFMovie_addExport(mo, (SWFBlock)mc4, "export4");
     SWFMovie_writeExports(mo);
-    check(mo, "_global.val4 == undefined");
+    check_equals(mo, "_global.val4", "undefined");
     
     // Frame 6
     SWFMovie_nextFrame(mo);
@@ -112,7 +112,7 @@ main(int argc, char** argv)
     ia = newSWFInitAction_withId(
             newSWFAction("_global.val4 = 'mc4a';"), 4);
     SWFMovie_add(mo, (SWFBlock)ia);
-    check(mo, "_global.val4 == 'mc4a'");
+    check_equals(mo, "_global.val4", "'mc4a'");
     
     // Frame 7
     SWFMovie_nextFrame(mo);
@@ -124,12 +124,13 @@ main(int argc, char** argv)
     
     // Action is written before InitAction, but this does not matter. As
     // long as it's in the same frame it will work.
-    check(mo, "_global.val5 == 'mc5'");
+    check_equals(mo, "_global.val5", "'mc5'");
     
     ia = newSWFInitAction_withId(
             newSWFAction("trace('mc5'); _global.val5 = 'mc5';"), 5);
     SWFMovie_add(mo, (SWFBlock)ia);
-    check(mo, "_global.val5 == 'mc5'");
+
+    check_equals(mo, "_global.val5", "'mc5'");
 
     // Frame 8
     SWFMovie_nextFrame(mo);
@@ -155,7 +156,7 @@ main(int argc, char** argv)
     SWFMovie_nextFrame(mo);
 
     // Check that the skipped InitActions are executed.
-    check(mo, "_global.val6 == 'mc6'");
+    check_equals(mo, "_global.val6", "'mc6'");
     
     /// Now check what happens on a loop. The situation is:
     //
@@ -242,7 +243,7 @@ main(int argc, char** argv)
     check_equals(mo, "_global.init7", "true");
     check_equals(mo, "_global.init8", "true");
 
-    add_actions(mo, "stop();");
+    add_actions(mo, " _root.totals(); stop(); ");
   
     puts("Saving " OUTPUT_FILENAME );
     SWFMovie_save(mo, OUTPUT_FILENAME);

-----------------------------------------------------------------------

Summary of changes:
 .../misc-ming.all/init_action/InitActionTest2.c    |   29 ++++++++++---------
 1 files changed, 15 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Gnash