diff options
| author | Jukka Jylänki <jujjyl@gmail.com> | 2013-11-13 20:14:45 +0200 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-11-13 20:14:45 +0200 |
| commit | d7c0edfbb50d2214db2bf78fee66f40f2d5397fe (patch) | |
| tree | 28b3c8647182a8d96642097d78c225871a3f39b0 | |
| parent | 767baea69d222de9d1b7c40a8956051784d8843d (diff) | |
Use CMake to build zlib in test other.test_outline on Windows. This test did not pass since 'sh ./configure' was attempted to build on Windows.
| -rw-r--r-- | tests/test_other.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/test_other.py b/tests/test_other.py index fafa6d33..e54add18 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -819,8 +819,12 @@ f.close() }), ]: Building.COMPILER_TEST_OPTS = test_opts + if WINDOWS: + zlib_library = self.get_library('zlib', os.path.join('libz.a'), configure=['emconfigure.bat'], configure_args=['cmake', '.', '-DBUILD_SHARED_LIBS=OFF'], make=['mingw32-make'], make_args=[]) + else: + zlib_library = self.get_library('zlib', os.path.join('libz.a'), make_args=['libz.a']) test('zlib', path_from_root('tests', 'zlib', 'example.c'), - self.get_library('zlib', os.path.join('libz.a'), make_args=['libz.a']), + zlib_library, open(path_from_root('tests', 'zlib', 'ref.txt'), 'r').read(), expected_ranges, args=['-I' + path_from_root('tests', 'zlib')], suffix='c') |