Skip to content

Commit ba1d21d

Browse files
committed
Fix test browser.test_sdl_image_compressed on Windows when the system does not have Cygwin make, but does have MinGW32 make.
1 parent ae5212d commit ba1d21d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

tests/test_browser.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ def build_native_lzma(self):
8585
cwd = os.getcwd()
8686
try:
8787
os.chdir(path_from_root('third_party', 'lzma.js'))
88-
Popen(['sh', './doit.sh']).communicate()
88+
if WINDOWS and Building.which('mingw32-make'): # On Windows prefer using MinGW make if it exists, otherwise fall back to hoping we have cygwin make.
89+
Popen(['doit.bat']).communicate()
90+
else:
91+
Popen(['sh', './doit.sh']).communicate()
8992
finally:
9093
os.chdir(cwd)
9194

third_party/lzma.js/doit.bat

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
cd lzip
2+
call mingw32-make lzip
3+
copy /Y lzip.exe ..\lzma-native.exe
4+
cd ..

0 commit comments

Comments
 (0)