[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 455620dcb32839c810ed
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 455620dcb32839c810ed96fdce9c81695f1613ce |
Date: |
Tue, 23 Nov 2010 20:07:13 +0000 |
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 455620dcb32839c810ed96fdce9c81695f1613ce (commit)
via 4f05439160b49956609589cde946446369b88f8e (commit)
from 8d9e6c1cd16230b5e3da2162f6bf842af81557cd (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=455620dcb32839c810ed96fdce9c81695f1613ce
commit 455620dcb32839c810ed96fdce9c81695f1613ce
Author: Sandro Santilli <address@hidden>
Date: Tue Nov 23 21:06:34 2010 +0100
Have gravity_embedded-TestRunner wait for gravity.swf load
diff --git a/testsuite/movies.all/gravity_embedded-TestRunner.cpp
b/testsuite/movies.all/gravity_embedded-TestRunner.cpp
index 8119d69..c93dcdf 100644
--- a/testsuite/movies.all/gravity_embedded-TestRunner.cpp
+++ b/testsuite/movies.all/gravity_embedded-TestRunner.cpp
@@ -42,23 +42,16 @@ main(int /*argc*/, char** /*argv*/)
string filename = string(SRCDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
- // TODO: check why we need this !!
- // I wouldn't want the first advance to be needed
- tester.advance();
-
gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity(1);
const MovieClip* root = tester.getRootMovie();
assert(root);
- //const DisplayList& dl = root->getDisplayList();
- //dl.dump(std::cout);
-
check_equals(root->get_frame_count(), 1);
- // give loader time to load the actual gravity.swf movie
- for (int i=0; i<5; i++) {
+ // wait for loader to get ball in
+ while ( ! tester.findDisplayItemByTarget("_level0.container.ball") ) {
usleep(1000);
tester.advance(); // have load processed
}
http://git.savannah.gnu.org/cgit//commit/?id=4f05439160b49956609589cde946446369b88f8e
commit 4f05439160b49956609589cde946446369b88f8e
Author: Sandro Santilli <address@hidden>
Date: Tue Nov 23 21:06:29 2010 +0100
Add findDisplayItemByTarget in MovieTester
diff --git a/testsuite/MovieTester.cpp b/testsuite/MovieTester.cpp
index a6c9a78..e8a79f4 100644
--- a/testsuite/MovieTester.cpp
+++ b/testsuite/MovieTester.cpp
@@ -322,6 +322,12 @@ MovieTester::findDisplayItemByName(const MovieClip& mc,
}
const DisplayObject*
+MovieTester::findDisplayItemByTarget(const std::string& tgt)
+{
+ return _movie_root->findCharacterByTarget(tgt);
+}
+
+const DisplayObject*
MovieTester::findDisplayItemByDepth(const MovieClip& mc,
int depth)
{
diff --git a/testsuite/MovieTester.h b/testsuite/MovieTester.h
index a8ffa4a..1451b89 100644
--- a/testsuite/MovieTester.h
+++ b/testsuite/MovieTester.h
@@ -148,6 +148,12 @@ public:
const DisplayObject* findDisplayItemByName(const MovieClip& mc,
const std::string& name);
+ /// Find a DisplayObject on the stage by full target name.
+ //
+ /// Return NULL if there's no DisplayObject reachable with that target.
+ ///
+ const DisplayObject* findDisplayItemByTarget(const std::string& tgt);
+
/// Find a DisplayObject in the display list of a sprite by depth.
//
/// Return NULL if there's no DisplayObject at that depth in
-----------------------------------------------------------------------
Summary of changes:
testsuite/MovieTester.cpp | 6 ++++++
testsuite/MovieTester.h | 6 ++++++
.../movies.all/gravity_embedded-TestRunner.cpp | 11 ++---------
3 files changed, 14 insertions(+), 9 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 455620dcb32839c810ed96fdce9c81695f1613ce,
Sandro Santilli <=