diff options
| author | max99x <max99x@gmail.com> | 2011-08-23 06:10:22 +0300 |
|---|---|---|
| committer | max99x <max99x@gmail.com> | 2011-08-23 06:10:22 +0300 |
| commit | 0e2cbf14971ff4145c62e61e118fc6095a658a3a (patch) | |
| tree | fbe25c6b5f49a5d283add4f085367b950820259b /tests/runner.py | |
| parent | 536bad16ce88bad71fe94af285f9a9d2f721b2ad (diff) | |
| parent | af67804695835d1ce1e084614a886366768b2015 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tests/runner.py')
| -rw-r--r-- | tests/runner.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/runner.py b/tests/runner.py index ec47416f..e866649d 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -3746,8 +3746,11 @@ else: USE_CLOSURE_COMPILER = 1 if USE_CLOSURE_COMPILER: - index = SPIDERMONKEY_ENGINE.index("options('strict')") - SPIDERMONKEY_ENGINE = SPIDERMONKEY_ENGINE[:index-1] + SPIDERMONKEY_ENGINE[index+1:] # closure generates non-strict + try: + index = SPIDERMONKEY_ENGINE.index("options('strict')") + SPIDERMONKEY_ENGINE = SPIDERMONKEY_ENGINE[:index-1] + SPIDERMONKEY_ENGINE[index+1:] # closure generates non-strict + except: + pass COMPILER = CLANG JS_ENGINE = SPIDERMONKEY_ENGINE @@ -3758,12 +3761,13 @@ else: QUANTUM_SIZE = 1 RELOOP = OPTIMIZE = 1 USE_TYPED_ARRAYS = 0 - ASSERTIONS = SAFE_HEAP = CHECK_OVERFLOWS = CORRECT_OVERFLOWS = CHECK_SIGNS = INIT_STACK = AUTO_OPTIMIZE = RUNTIME_TYPE_INFO = DISABLE_EXCEPTIONS = 0 + ASSERTIONS = SAFE_HEAP = CHECK_OVERFLOWS = CORRECT_OVERFLOWS = CHECK_SIGNS = INIT_STACK = AUTO_OPTIMIZE = RUNTIME_TYPE_INFO = 0 INVOKE_RUN = 1 CORRECT_SIGNS = 0 CORRECT_ROUNDINGS = 0 CORRECT_OVERFLOWS_LINES = CORRECT_SIGNS_LINES = CORRECT_ROUNDINGS_LINES = SAFE_HEAP_LINES = [] LLVM_OPTS = 1 + DISABLE_EXCEPTIONS = 1 TEST_REPS = 4 TOTAL_TESTS = 6 @@ -3804,8 +3808,8 @@ else: os.remove(filename + '.cc.js') except: pass - # Something like this: - # 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 + # Something like this (adjust memory as needed): + # java -Xmx1024m -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', 'ADVANCED_OPTIMIZATIONS', |