diff options
| -rw-r--r-- | src/postamble.js | 5 | ||||
| -rw-r--r-- | tests/runner.py | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/postamble.js b/src/postamble.js index 435a6930..cb0521aa 100644 --- a/src/postamble.js +++ b/src/postamble.js @@ -1,7 +1,7 @@ // === Auto-generated postamble setup entry stuff === -function callMain(args) { +Module.callMain = function callMain(args) { var argc = args.length+1; function pad() { for (var i = 0; i < QUANTUM_SIZE-1; i++) { @@ -17,9 +17,8 @@ function callMain(args) { argv.push(0); argv = Pointer_make(argv, null); - Module._main(argc, argv, 0); + _main(argc, argv, 0); } -Module['callMain'] = callMain; function run(args) { __initializeRuntime__(); diff --git a/tests/runner.py b/tests/runner.py index a05e08eb..5897b263 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -2120,11 +2120,11 @@ else: except: pass # Something like this: - # java -jar CLOSURE_COMPILER --compilation_level ADVANCED_OPTIMIZATIONS --formatting PRETTY_PRINT --variable_map_output_file src.cpp.o.js.vars --js src.cpp.o.js --js_output_file src.cpp.o.cc.js + # java -jar CLOSURE_COMPILER --compilation_level ADVANCED_OPTIMIZATIONS --variable_map_output_file src.cpp.o.js.vars --js src.cpp.o.js --js_output_file src.cpp.o.cc.js cc_output = Popen(['java', '-jar', CLOSURE_COMPILER, - '--compilation_level', 'SIMPLE_OPTIMIZATIONS', # XXX - ADVANCED clashes with our _STDIO object - '--formatting', 'PRETTY_PRINT', + '--compilation_level', 'ADVANCED_OPTIMIZATIONS', + #'--formatting', 'PRETTY_PRINT', '--variable_map_output_file', filename + '.vars', '--js', filename + '.o.js', '--js_output_file', filename + '.cc.js'], stdout=PIPE, stderr=STDOUT).communicate()[0] if 'ERROR' in cc_output: |