[Gnash-commit] [SCM] Gnash branch, master, updated. 6632445f89338d2abc0c43adb33211481d95c79f

[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  6632445f89338d2abc0c43adb33211481d95c79f (commit)
       via  22a70dc0672b85a0fb83d28e6cb2bd6db0252f96 (commit)
      from  1afc8d995dbe9ec9447744fa4745e2f781e84576 (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=6632445f89338d2abc0c43adb33211481d95c79f


commit 6632445f89338d2abc0c43adb33211481d95c79f
Merge: 22a70dc 1afc8d9
Author: Sandro Santilli <address@hidden>
Date:   Tue Nov 16 19:57:23 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=22a70dc0672b85a0fb83d28e6cb2bd6db0252f96


commit 22a70dc0672b85a0fb83d28e6cb2bd6db0252f96
Author: Sandro Santilli <address@hidden>
Date:   Tue Nov 16 19:56:40 2010 +0100

    Advance 5 times before assuming gravity.swf was loaded. Should fix 
http://savannah.gnu.org/bugs/?31594.

diff --git a/testsuite/movies.all/gravity_embedded-TestRunner.cpp 
b/testsuite/movies.all/gravity_embedded-TestRunner.cpp
index d130bd1..8119d69 100644
--- a/testsuite/movies.all/gravity_embedded-TestRunner.cpp
+++ b/testsuite/movies.all/gravity_embedded-TestRunner.cpp
@@ -58,8 +58,10 @@ main(int /*argc*/, char** /*argv*/)
        check_equals(root->get_frame_count(), 1);
 
        // give loader time to load the actual gravity.swf movie 
-       usleep(5000);
-       tester.advance(); // have load processed
+       for (int i=0; i<5; i++) {
+               usleep(1000);
+               tester.advance(); // have load processed
+       }
 
        // used to get members
        as_value tmp;
@@ -68,7 +70,7 @@ main(int /*argc*/, char** /*argv*/)
        check(loaded);
        check_equals(loaded->parent(), root);
 
-    VM& vm = tester.vm();
+       VM& vm = tester.vm();
 
        string_table& st = vm.getStringTable();
        string_table::key xscale = st.find("_xscale");

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

Summary of changes:
 .../movies.all/gravity_embedded-TestRunner.cpp     |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash