diff options
| -rwxr-xr-x | tests/runner.py | 17 | ||||
| -rw-r--r-- | tools/js_optimizer.py | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/tests/runner.py b/tests/runner.py index 3401c621..94d32d70 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -10478,11 +10478,18 @@ fi (['--jcache'], 'hello_world_loop.cpp', True, False), (['--jcache'], 'hello_world_loop.cpp', False, True), ([], 'hello_world_loop.cpp', False, False), - ([], 'hello_world.cpp', False, False), # switch input, cannot use cached stuff + # new + ([], 'hello_world.cpp', False, False), (['--jcache'], 'hello_world.cpp', True, False), (['--jcache'], 'hello_world.cpp', False, True), ([], 'hello_world.cpp', False, False), - (['--jcache'], 'hello_world_loop.cpp', False, True), # go back to old file, experience caching + # go back to old file, experience caching + (['--jcache'], 'hello_world_loop.cpp', False, True), + # new, large file + ([], 'hello_malloc.cpp', False, False), + (['--jcache'], 'hello_malloc.cpp', True, False), + (['--jcache'], 'hello_malloc.cpp', False, True), + ([], 'hello_malloc.cpp', False, False), ]: print >> sys.stderr, args, input_file, expect_save, expect_load self.clear() @@ -10498,9 +10505,9 @@ fi if input_file not in srcs: srcs[input_file] = curr else: - #open('/home/alon/Dev/emscripten/a', 'w').write(srcs[input_file]) - #open('/home/alon/Dev/emscripten/b', 'w').write(curr) - assert len(curr) == len(srcs[input_file]), 'contents may shift in order, but must remain the same size %d vs %d' % (len(curr), len(srcs[input_file])) + '\n' + err + open('/home/alon/Dev/emscripten/a', 'w').write(srcs[input_file]) + open('/home/alon/Dev/emscripten/b', 'w').write(curr) + assert abs(len(curr)/float(len(srcs[input_file]))-1)<0.01, 'contents may shift in order, but must remain the same size %d vs %d' % (len(curr), len(srcs[input_file])) + '\n' + err used_jcache = used_jcache or ('--jcache' in args) assert used_jcache == os.path.exists(JCache.get_cachename('emscript_files')) diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py index a63fc794..b5ffdc2d 100644 --- a/tools/js_optimizer.py +++ b/tools/js_optimizer.py @@ -121,9 +121,11 @@ def run(filename, passes, js_engine, jcache): f = open(filename, 'w') for out_file in filenames: f.write(open(out_file).read()) + f.write('\n') if jcache: for cached in cached_outputs: f.write(cached); # TODO: preserve order + f.write('\n') f.write(suffix) f.write('\n') f.close() |