diff --git a/tests/test_browser.py b/tests/test_browser.py index 71f3fc5d2a401..d9725ca3debf2 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -3206,19 +3206,20 @@ def test_sdl2_mixer_wav(self): self.btest('sdl2_mixer_wav.c', expected='1', args=['--preload-file', 'sound.wav', '-s', 'USE_SDL=2', '-s', 'USE_SDL_MIXER=2', '-s', 'INITIAL_MEMORY=33554432']) @parameterized({ - 'ogg': ('ogg', 'alarmvictory_1.ogg'), - 'mp3': ('mp3', 'pudinha.mp3'), + 'wav': ([], '0', 'the_entertainer.wav'), + 'ogg': (['ogg'], 'MIX_INIT_OGG', 'alarmvictory_1.ogg'), + 'mp3': (['mp3'], 'MIX_INIT_MP3', 'pudinha.mp3'), }) @requires_sound_hardware - def test_sdl2_mixer_music(self, fmt, music_name): + def test_sdl2_mixer_music(self, formats, flags, music_name): shutil.copyfile(path_from_root('tests', 'sounds', music_name), music_name) self.btest('sdl2_mixer_music.c', expected='1', args=[ '--preload-file', music_name, '-DSOUND_PATH=' + json.dumps(music_name), - '-DFLAGS=' + ('MIX_INIT_' + fmt.upper() if fmt else '0'), + '-DFLAGS=' + flags, '-s', 'USE_SDL=2', '-s', 'USE_SDL_MIXER=2', - '-s', 'SDL2_MIXER_FORMATS=' + json.dumps([fmt] if fmt else []), + '-s', 'SDL2_MIXER_FORMATS=' + json.dumps(formats), '-s', 'INITIAL_MEMORY=33554432' ]) diff --git a/tests/test_interactive.py b/tests/test_interactive.py index ca5cf9abb20c4..9b63027cb5690 100644 --- a/tests/test_interactive.py +++ b/tests/test_interactive.py @@ -117,20 +117,21 @@ def test_sdl2_mixer_wav(self): ]) @parameterized({ - 'ogg': ('ogg', 'alarmvictory_1.ogg'), - 'mp3': ('mp3', 'pudinha.mp3'), + 'wav': ([], '0', 'the_entertainer.wav'), + 'ogg': (['ogg'], 'MIX_INIT_OGG', 'alarmvictory_1.ogg'), + 'mp3': (['mp3'], 'MIX_INIT_MP3', 'pudinha.mp3'), }) - def test_sdl2_mixer_music(self, fmt, music_name): + def test_sdl2_mixer_music(self, formats, flags, music_name): shutil.copyfile(path_from_root('tests', 'sounds', music_name), music_name) self.btest('sdl2_mixer_music.c', expected='1', args=[ '-O2', '--minify', '0', '--preload-file', music_name, '-DSOUND_PATH=' + json.dumps(music_name), - '-DFLAGS=' + ('MIX_INIT_' + fmt.upper() if fmt else '0'), + '-DFLAGS=' + flags, '-s', 'USE_SDL=2', '-s', 'USE_SDL_MIXER=2', - '-s', 'SDL2_MIXER_FORMATS=' + json.dumps([fmt] if fmt else []), + '-s', 'SDL2_MIXER_FORMATS=' + json.dumps(formats), '-s', 'INITIAL_MEMORY=33554432' ]) diff --git a/tools/ports/sdl2_mixer.py b/tools/ports/sdl2_mixer.py index 041759ee541ba..f515e4f0833f1 100644 --- a/tools/ports/sdl2_mixer.py +++ b/tools/ports/sdl2_mixer.py @@ -39,7 +39,8 @@ def create(): flags = [ '-s', 'USE_SDL=2', - '-O2' + '-O2', + '-DMUSIC_WAV', ] if "ogg" in settings.SDL2_MIXER_FORMATS: