aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJukka Jylanki <jujjyl@gmail.com>2014-04-14 15:12:01 +0300
committerJukka Jylanki <jujjyl@gmail.com>2014-04-14 15:12:01 +0300
commit96a1da27484c4579e9e6e5e6ad1242865b54ee02 (patch)
tree091a7223f13dd5d807818b96d30a48cc5261f707 /tools
parent022873c12ec07fab6fbd72d04f7a2616b8f0abc9 (diff)
Allow setting SPIDERMONKEY_ENGINE=None in .emscripten to simplify test runner operation.
Diffstat (limited to 'tools')
-rw-r--r--tools/shared.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/shared.py b/tools/shared.py
index e912a700..82bdd98b 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -746,13 +746,14 @@ else:
# Engine tweaks
try:
- new_spidermonkey = listify(SPIDERMONKEY_ENGINE)
- if 'gcparam' not in str(new_spidermonkey):
- new_spidermonkey += ['-e', "gcparam('maxBytes', 1024*1024*1024);"] # Our very large files need lots of gc heap
- if '-w' not in str(new_spidermonkey):
- new_spidermonkey += ['-w']
- JS_ENGINES = map(lambda x: new_spidermonkey if x == SPIDERMONKEY_ENGINE else x, JS_ENGINES)
- SPIDERMONKEY_ENGINE = new_spidermonkey
+ if SPIDERMONKEY_ENGINE:
+ new_spidermonkey = listify(SPIDERMONKEY_ENGINE)
+ if 'gcparam' not in str(new_spidermonkey):
+ new_spidermonkey += ['-e', "gcparam('maxBytes', 1024*1024*1024);"] # Our very large files need lots of gc heap
+ if '-w' not in str(new_spidermonkey):
+ new_spidermonkey += ['-w']
+ JS_ENGINES = map(lambda x: new_spidermonkey if x == SPIDERMONKEY_ENGINE else x, JS_ENGINES)
+ SPIDERMONKEY_ENGINE = new_spidermonkey
except NameError:
pass