From 7b6f5e349ea9e07546f52553ae6c386a2bce2a0f Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 10 Apr 2014 14:29:33 -0700 Subject: fix test_static_link zlib for new musl --- tests/test_other.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/test_other.py b/tests/test_other.py index 16b5ab92..cdea493a 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -856,10 +856,14 @@ This pointer might make sense in another type signature: i: 0 if engine == SPIDERMONKEY_ENGINE: self.validate_asmjs(out) # zlib compression library. tests function pointers in initializers and many other things - test('zlib', '', open(path_from_root('tests', 'zlib', 'example.c'), 'r').read(), - self.get_zlib_library(), - open(path_from_root('tests', 'zlib', 'ref.txt'), 'r').read(), - args=['-I' + path_from_root('tests', 'zlib')], suffix='c') + try: + os.environ['EMCC_FORCE_STDLIBS'] = 'libcextra' + test('zlib', '', open(path_from_root('tests', 'zlib', 'example.c'), 'r').read(), + self.get_zlib_library(), + open(path_from_root('tests', 'zlib', 'ref.txt'), 'r').read(), + args=['-I' + path_from_root('tests', 'zlib')], suffix='c') + finally: + del os.environ['EMCC_FORCE_STDLIBS'] use_cmake = WINDOWS bullet_library = get_bullet_library(self, use_cmake) -- cgit v1.2.3-18-g5258