[Gnash-commit] /srv/bzr/gnash/trunk r11095: Expect consistency checking for Hello and AddChild tests (the version of HaXe we require now produces bytecode that confuses Gnash's AVM2 a lot!)

[Sandro Santilli]

------------------------------------------------------------
revno: 11095
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Fri 2009-06-12 22:50:23 +0200
message:
  Expect consistency checking for Hello and AddChild tests (the version of HaXe 
we require now produces bytecode that confuses Gnash's AVM2 a lot!)
modified:
  libsound/sdl/sound_handler_sdl.cpp
  testsuite/misc-haxe.all/Makefile.am
  testsuite/misc-ming.all/streamingSoundTest1.c

=== modified file 'libsound/sdl/sound_handler_sdl.cpp'
--- a/libsound/sdl/sound_handler_sdl.cpp        2009-06-09 14:04:51 +0000
+++ b/libsound/sdl/sound_handler_sdl.cpp        2009-06-12 20:50:23 +0000
@@ -362,9 +362,14 @@
 
     unsigned int bufLen = static_cast<unsigned int>(bufLenIn);
     boost::int16_t* samples = reinterpret_cast<boost::int16_t*>(buf);
-    assert(!(bufLen%2));
+
+    // 16 bit per sample, 2 channels == 4 bytes per fetch ?
+    assert(!(bufLen%4));
+
     unsigned int nSamples = bufLen/2;
 
+    //log_debug("Fetching %d bytes (%d samples)", bufLen, nSamples);
+
     // Get the soundhandler
     SDL_sound_handler* handler = static_cast<SDL_sound_handler*>(udata);
     handler->fetchSamples(samples, nSamples);

=== modified file 'testsuite/misc-haxe.all/Makefile.am'
--- a/testsuite/misc-haxe.all/Makefile.am       2009-05-14 10:26:47 +0000
+++ b/testsuite/misc-haxe.all/Makefile.am       2009-06-12 20:50:23 +0000
@@ -20,14 +20,14 @@
 
 # These will get executed and parsed for test output
 SANE_ASTESTS = \
+       $(NULL)
+
+# These ones are the ones for which consistency check fail 
+BOGUS_ASTESTS = \
        Hello.hx \
        AddChild.hx \
        $(NULL)
 
-# These ones are the ones for which consistency check fail 
-BOGUS_ASTESTS = \
-       $(NULL)
-
 ASTESTS = $(SANE_ASTESTS) $(BOGUS_ASTESTS)
 
 EXTRA_DIST = $(ASTESTS) Dejagnu.hx check.as

=== modified file 'testsuite/misc-ming.all/streamingSoundTest1.c'
--- a/testsuite/misc-ming.all/streamingSoundTest1.c     2009-02-25 22:33:03 
+0000
+++ b/testsuite/misc-ming.all/streamingSoundTest1.c     2009-06-12 20:50:23 
+0000
@@ -87,6 +87,13 @@
 
   it = SWFMovie_add(mo, mc);
   SWFMovie_nextFrame(mo);
+  SWFMovie_nextFrame(mo);
+  SWFMovie_nextFrame(mo);
+  SWFMovie_nextFrame(mo);
+  SWFMovie_nextFrame(mo);
+  SWFMovie_nextFrame(mo);
+  SWFMovie_nextFrame(mo);
+  SWFMovie_nextFrame(mo);
 
   //Output movie
   puts("Saving " OUTPUT_FILENAME );