[Gnash-commit] [SCM] Gnash branch, master, updated. c923fea8221a60656066e4198206ead62521b4b9

[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  c923fea8221a60656066e4198206ead62521b4b9 (commit)
      from  fe4f7bdadfd5d99022bf9dfaf825bff53208b0bf (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=c923fea8221a60656066e4198206ead62521b4b9


commit c923fea8221a60656066e4198206ead62521b4b9
Author: Sandro Santilli <address@hidden>
Date:   Fri Dec 17 23:46:27 2010 +0100

    Accept 13766 as a valid sound duration too (some liblame versions give that 
number to swfc...)

diff --git a/testsuite/misc-swfc.all/sound.sc b/testsuite/misc-swfc.all/sound.sc
index f8c6460..848ca06 100644
--- a/testsuite/misc-swfc.all/sound.sc
+++ b/testsuite/misc-swfc.all/sound.sc
@@ -20,9 +20,17 @@
 
                trace("Sound duration is: ");
                trace(snd.duration);
-               trace("Correct value should be 13740");
+               trace("Correct value should be 13740 or 13766 " +
+                       "(depending on liblame version)");
                // fails when no media handler is compiled-in
-               check_equals(snd.duration, 13740);
+               // TODO: handle that case
+               if ( snd.duration != 13740 && snd.duration != 13766 )
+               {
+                       Dejagnu.fail("snd.duration="+snd.duration +
+                               ", expected 13740 or 13766 " + _INFO_);
+               } else {
+                       Dejagnu.pass("snd.duration="+snd.duration + _INFO_);
+               }
        
                trace("Now I'll get the position before starting it");
                sndpos=snd.position;

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

Summary of changes:
 testsuite/misc-swfc.all/sound.sc |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash