diff options
| author | Jukka Jylänki <jujjyl@gmail.com> | 2013-11-16 18:16:38 +0200 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-11-17 22:06:01 +0200 |
| commit | ba1d21daa8812d3b5216df538e7c1a0b180bef00 (patch) | |
| tree | 56232d45cf7e51a6c0d18d4e84a334d02060f960 | |
| parent | ae5212d9d4059de34aad570192e68d12d21f6308 (diff) | |
Fix test browser.test_sdl_image_compressed on Windows when the system does not have Cygwin make, but does have MinGW32 make.
| -rw-r--r-- | tests/test_browser.py | 5 | ||||
| -rw-r--r-- | third_party/lzma.js/doit.bat | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/test_browser.py b/tests/test_browser.py index 1936bb39..3ad2087e 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -85,7 +85,10 @@ If manually bisecting: cwd = os.getcwd() try: os.chdir(path_from_root('third_party', 'lzma.js')) - Popen(['sh', './doit.sh']).communicate() + 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. + Popen(['doit.bat']).communicate() + else: + Popen(['sh', './doit.sh']).communicate() finally: os.chdir(cwd) diff --git a/third_party/lzma.js/doit.bat b/third_party/lzma.js/doit.bat new file mode 100644 index 00000000..17b4f473 --- /dev/null +++ b/third_party/lzma.js/doit.bat @@ -0,0 +1,4 @@ +cd lzip +call mingw32-make lzip +copy /Y lzip.exe ..\lzma-native.exe +cd .. |