diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-07-29 13:07:57 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-07-29 13:07:57 -0700 |
| commit | df145aa4b2b8f04b3883ffb955dfd7e499da13f8 (patch) | |
| tree | 0dfb60bfbe1337ffeef7a23b6823967f65533948 | |
| parent | c1e16b134729a0e39beca4211a9bd9468ebb466b (diff) | |
updates for latest spidermonkey trunk
| -rw-r--r-- | src/shell.js | 8 | ||||
| -rw-r--r-- | tests/runner.py | 3 | ||||
| -rw-r--r-- | tools/shared.py | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/shell.js b/src/shell.js index c73cf6e4..06cf4175 100644 --- a/src/shell.js +++ b/src/shell.js @@ -13,9 +13,13 @@ if (!this['Module']) { this['Module'] = {}; } try { - Module.arguments = arguments; + Module.arguments = scriptArgs; } catch(e) { - Module.arguments = []; + try { + Module.arguments = arguments; + } catch(e) { + Module.arguments = []; + } } //*/ diff --git a/tests/runner.py b/tests/runner.py index e46683dd..1ea17a63 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -3145,7 +3145,8 @@ else: USE_CLOSURE_COMPILER = 1 if USE_CLOSURE_COMPILER: - SPIDERMONKEY_ENGINE = filter(lambda x: x != '-s', SPIDERMONKEY_ENGINE) # closure generates non-strict + index = SPIDERMONKEY_ENGINE.index("options('strict')") + SPIDERMONKEY_ENGINE = SPIDERMONKEY_ENGINE[:index-1] + SPIDERMONKEY_ENGINE[index+1:] # closure generates non-strict COMPILER = CLANG JS_ENGINE = SPIDERMONKEY_ENGINE diff --git a/tools/shared.py b/tools/shared.py index 9ccc2105..0ee9a0ac 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -25,8 +25,8 @@ BINDINGS_GENERATOR = path_from_root('tools', 'bindings_generator.py') # Engine tweaks -if '-s' not in SPIDERMONKEY_ENGINE: - SPIDERMONKEY_ENGINE += ['-s'] # Strict mode in SpiderMonkey. With V8 we check that fallback to non-strict works too +if 'strict' not in str(SPIDERMONKEY_ENGINE): + SPIDERMONKEY_ENGINE += ['-e', "options('strict')"] # Strict mode in SpiderMonkey. With V8 we check that fallback to non-strict works too if 'gcparam' not in str(SPIDERMONKEY_ENGINE): SPIDERMONKEY_ENGINE += ['-e', "gcparam('maxBytes', 1024*1024*1024);"] # Our very large files need lots of gc heap |