From d7c0edfbb50d2214db2bf78fee66f40f2d5397fe Mon Sep 17 00:00:00 2001 From: Jukka Jylänki Date: Wed, 13 Nov 2013 20:14:45 +0200 Subject: 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. --- tests/test_other.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/test_other.py') 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') -- cgit v1.2.3-18-g5258