[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp tests...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/07 14:50:34

Modified files:
        .              : ChangeLog 
        testsuite      : MovieTester.cpp MovieTester.h 
        testsuite/misc-ming.all: NetStream-SquareTestRunner.cpp 

Log message:
                * testsuite/MovieTester.{cpp,h}: add a canTestVideo() method.
                * testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: don't
                  wait for Play.Stop event to be sent if video can't be tested
                  (ie: not supported by mad).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3487&r2=1.3488
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3487
retrieving revision 1.3488
diff -u -b -r1.3487 -r1.3488
--- ChangeLog   7 Jun 2007 14:11:25 -0000       1.3487
+++ ChangeLog   7 Jun 2007 14:50:33 -0000       1.3488
@@ -1,3 +1,10 @@
+2007-06-07 Sandro Santilli <address@hidden>
+
+       * testsuite/MovieTester.{cpp,h}: add a canTestVideo() method.
+       * testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: don't
+         wait for Play.Stop event to be sent if video can't be tested
+         (ie: not supported by mad).
+
 2007-06-07 Ann Barcomb <address@hidden>
 
        * doc/C/usermanual/installation/building.xml: mention that

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- testsuite/MovieTester.cpp   7 Jun 2007 12:50:10 -0000       1.42
+++ testsuite/MovieTester.cpp   7 Jun 2007 14:50:34 -0000       1.43
@@ -448,9 +448,23 @@
        set_render_handler(&(_testingRenderers.back()->getRenderer()));
 }
 
+bool
+MovieTester::canTestVideo() const
+{
+       if ( ! canTestSound() ) return false;
+
+#ifdef USE_MAD
+       // mad doesn't support video !
+       return false;
+#endif
+
+       return true;
+}
+
 void
 MovieTester::initTestingSoundHandlers()
 {
+
 #ifdef SOUND_SDL
        cout << "Creating SDL sound handler" << endl;
         _sound_handler.reset( gnash::create_sound_handler_sdl() );

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/MovieTester.h     7 Jun 2007 12:35:21 -0000       1.26
+++ testsuite/MovieTester.h     7 Jun 2007 14:50:34 -0000       1.27
@@ -236,6 +236,9 @@
        ///
        bool canTestRendering() const { return ! _testingRenderers.empty(); }
 
+       /// Return true if this build of gnash supports video
+       bool canTestVideo() const;
+
 private:
 
        /// Initialize testing renderers

Index: testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp      28 May 2007 
15:41:12 -0000      1.3
+++ testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp      7 Jun 2007 
14:50:34 -0000       1.4
@@ -46,6 +46,12 @@
        sprite_instance* root = tester.getRootMovie();
        assert(root);
 
+       if ( ! tester.canTestVideo() )
+       {
+               cout << "UNTESTED: NetStream video (not supported by this 
build)." << endl;
+               return EXIT_SUCCESS;
+       }
+
        // On NetStatus.Play.Stop we jump to last frame and stop,
        // so this loop is about equivalent to running a
        // generic self-contained test.