Skip to content

Commit 2616d04

Browse files
authored
disable broken sdl2-sdl1 audio mixing test. the test happened to work but depended on fragile things that should not have worked. we need a proper SDL2_mixer port for SDL2 (#5858) [ci skip]
1 parent cf32049 commit 2616d04

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

tests/test_interactive.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,14 @@ def test_sdl_audio(self):
5656
Popen([PYTHON, EMCC, '-O2', '--closure', '1', '--minify', '0', os.path.join(self.get_dir(), 'sdl_audio.c'), '--preload-file', 'sound.ogg', '--preload-file', 'sound2.wav', '--embed-file', 'the_entertainer.ogg', '--preload-file', 'noise.ogg', '--preload-file', 'bad.ogg', '-o', 'page.html', '-s', 'EXPORTED_FUNCTIONS=["_main", "_play", "_play2"]']).communicate()
5757
self.run_browser('page.html', '', '/report_result?1')
5858

59-
print('SDL2')
60-
59+
#print('SDL2')
6160
# check sdl2 as well
62-
Popen([PYTHON, EMCC, '-O1', '--closure', '0', '--minify', '0', os.path.join(self.get_dir(), 'sdl_audio.c'), '--preload-file', 'sound.ogg', '--preload-file', 'sound2.wav', '--embed-file', 'the_entertainer.ogg', '--preload-file', 'noise.ogg', '--preload-file', 'bad.ogg', '-o', 'page.html', '-s', 'EXPORTED_FUNCTIONS=["_main", "_play", "_play2"]', '-s', 'USE_SDL=2', '-DUSE_SDL2']).communicate()
63-
self.run_browser('page.html', '', '/report_result?1')
61+
# FIXME: restore this test once we have proper SDL2 audio (existing test
62+
# depended on fragile SDL1/SDL2 mixing, which stopped working with
63+
# 7a5744d754e00bec4422405a1a94f60b8e53c8fc (which just uncovered
64+
# the existing problem)
65+
#Popen([PYTHON, EMCC, '-O1', '--closure', '0', '--minify', '0', os.path.join(self.get_dir(), 'sdl_audio.c'), '--preload-file', 'sound.ogg', '--preload-file', 'sound2.wav', '--embed-file', 'the_entertainer.ogg', '--preload-file', 'noise.ogg', '--preload-file', 'bad.ogg', '-o', 'page.html', '-s', 'EXPORTED_FUNCTIONS=["_main", "_play", "_play2"]', '-s', 'USE_SDL=2', '-DUSE_SDL2']).communicate()
66+
#self.run_browser('page.html', '', '/report_result?1')
6467

6568
def test_sdl_audio_mix_channels(self):
6669
shutil.copyfile(path_from_root('tests', 'sounds', 'noise.ogg'), os.path.join(self.get_dir(), 'sound.ogg'))

0 commit comments

Comments
 (0)