diff options
| -rwxr-xr-x | tests/runner.py | 5 | ||||
| -rw-r--r-- | tools/js_optimizer.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py index 7e720fe4..d2b58542 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -11937,6 +11937,8 @@ fi try: os.environ['EMCC_DEBUG'] = '1' + os.environ['EMCC_JSOPT_MIN_CHUNK_SIZE'] = str(1024*512) + self.working_dir = os.path.join(TEMP_DIR, 'emscripten_temp') if not os.path.exists(self.working_dir): os.makedirs(self.working_dir) @@ -11963,7 +11965,7 @@ fi (['--jcache'], 'hello_malloc.cpp', False, True, False, True, False, True, []), ([], 'hello_malloc.cpp', False, False, False, False, False, False, []), # new, huge file - ([], 'hello_libcxx.cpp', False, False, False, False, False, False, ('2 chunks', '3 chunks')), + ([], 'hello_libcxx.cpp', False, False, False, False, False, False, ('3 chunks',)), (['--jcache'], 'hello_libcxx.cpp', True, False, True, False, True, False, []), (['--jcache'], 'hello_libcxx.cpp', False, True, False, True, False, True, []), ([], 'hello_libcxx.cpp', False, False, False, False, False, False, []), @@ -11996,6 +11998,7 @@ fi finally: del os.environ['EMCC_DEBUG'] + del os.environ['EMCC_JSOPT_MIN_CHUNK_SIZE'] else: raise Exception('Test runner is confused: ' + str(sys.argv)) diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py index 52cae6e5..ca42081d 100644 --- a/tools/js_optimizer.py +++ b/tools/js_optimizer.py @@ -11,7 +11,7 @@ def path_from_root(*pathelems): JS_OPTIMIZER = path_from_root('tools', 'js-optimizer.js') NUM_CHUNKS_PER_CORE = 1.5 -MIN_CHUNK_SIZE = 1024*1024 +MIN_CHUNK_SIZE = int(os.environ.get('EMCC_JSOPT_MIN_CHUNK_SIZE') or 1024*1024) # configuring this is just for debugging purposes MAX_CHUNK_SIZE = 20*1024*1024 WINDOWS = sys.platform.startswith('win') |