[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp tests... [relea
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp tests... [release-0-8-0] |
Date: |
Wed, 06 Jun 2007 13:33:17 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release-0-8-0
Changes by: Sandro Santilli <strk> 07/06/06 13:33:17
Modified files:
. : ChangeLog
testsuite : MovieTester.cpp MovieTester.h
testsuite/misc-ming.all: eventSoundTest1-Runner.cpp
Log message:
* testsuite/misc-ming.all/eventSoundTest1-Runner.cpp: don't
test sound
if sound is not supported.
* testsuite/MovieTester.{cpp,h}: Don't abort if sound support
wasn't
compiled in. Add a canTestSound() method to query that
capability.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451.2.22&r2=1.3451.2.23
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.38.4.1&r2=1.38.4.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.23&r2=1.23.4.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.5&r2=1.5.4.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451.2.22
retrieving revision 1.3451.2.23
diff -u -b -r1.3451.2.22 -r1.3451.2.23
--- ChangeLog 6 Jun 2007 10:13:09 -0000 1.3451.2.22
+++ ChangeLog 6 Jun 2007 13:33:15 -0000 1.3451.2.23
@@ -1,5 +1,12 @@
2007-06-06 Sandro Santilli <address@hidden>
+ * testsuite/misc-ming.all/eventSoundTest1-Runner.cpp: don't test sound
+ if sound is not supported.
+ * testsuite/MovieTester.{cpp,h}: Don't abort if sound support wasn't
+ compiled in. Add a canTestSound() method to query that capability.
+
+2007-06-06 Sandro Santilli <address@hidden>
+
* testsuite/misc-ming.all/Makefile.am: VideoEmbed-SquareTest.swf
depends on testsuite/media/square.flv ! Fixes bug #20090.
* testsuite/misc-ming.all/NetStream-SquareTest.c: Fixed test for
Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.38.4.1
retrieving revision 1.38.4.2
diff -u -b -r1.38.4.1 -r1.38.4.2
--- testsuite/MovieTester.cpp 5 Jun 2007 13:09:33 -0000 1.38.4.1
+++ testsuite/MovieTester.cpp 6 Jun 2007 13:33:16 -0000 1.38.4.2
@@ -357,12 +357,14 @@
int
MovieTester::soundsStarted()
{
+ if ( ! _sound_handler.get() ) return 0;
return _sound_handler->numSoundsStarted();
}
int
MovieTester::soundsStopped()
{
+ if ( ! _sound_handler.get() ) return 0;
return _sound_handler->numSoundsStopped();
}
@@ -450,7 +452,8 @@
_sound_handler.reset( gnash::create_sound_handler_gst() );
#else
cerr << "Neigher SOUND_SDL nor SOUND_GST defined" << endl;
- exit(1);
+ return;
+ //exit(1);
#endif
gnash::set_sound_handler(_sound_handler.get());
Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.23
retrieving revision 1.23.4.1
diff -u -b -r1.23 -r1.23.4.1
--- testsuite/MovieTester.h 4 Jun 2007 17:16:26 -0000 1.23
+++ testsuite/MovieTester.h 6 Jun 2007 13:33:16 -0000 1.23.4.1
@@ -210,12 +210,24 @@
/// handles mouse events
bool isMouseOverMouseEntity();
- /// Return the number of times a sound has been stopped.
+ /// \brief
+ /// Return the number of times a sound has been stopped,
+ /// or 0 if sound testing is not supported. See canTestSound().
+ //
int soundsStopped();
- /// Return the number of times a sound has been started.
+ /// \brief
+ /// Return the number of times a sound has been started,
+ /// or 0 if sound testing is not supported. See canTestSound().
+ //
int soundsStarted();
+ /// Return true if this build of MovieTester supports sound testing
+ //
+ /// Sound will be supported as long as a sound handler was compiled in.
+ ///
+ bool canTestSound() const { return _sound_handler.get() != NULL; }
+
private:
/// Initialize testing renderers
Index: testsuite/misc-ming.all/eventSoundTest1-Runner.cpp
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -b -r1.5 -r1.5.4.1
--- testsuite/misc-ming.all/eventSoundTest1-Runner.cpp 28 May 2007 15:41:12
-0000 1.5
+++ testsuite/misc-ming.all/eventSoundTest1-Runner.cpp 6 Jun 2007 13:33:17
-0000 1.5.4.1
@@ -67,6 +67,12 @@
check_equals(root->get_frame_count(), 20);
+ if ( ! tester.canTestSound() )
+ {
+ cout << "UNTESTED: sounds can't be tested with this build." <<
endl;
+ return EXIT_SUCCESS; // so testing doesn't abort
+ }
+
// Advance and check...
int frame = root->get_current_frame(); // 1
int sounds = 1;
- [Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp tests... [release-0-8-0],
Sandro Santilli <=