diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-01-21 10:16:48 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-01-21 10:16:48 -0800 |
commit | f5d18e37bf343f1f7968c9cc6bba2babc00d2e6b (patch) | |
tree | 1df38856a66e30d85ffe79af9635f65445f62868 | |
parent | b5ab9c19299bea2aaa2c05d6bfc32df4444d4ec6 (diff) |
disable pruning of emcc -s opts from test runner - it's too buggy
-rw-r--r-- | tools/shared.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/shared.py b/tools/shared.py index 07c473da..4c6ddc23 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -307,11 +307,6 @@ class Settings: if args[i] == '-s': exec 'Settings.' + args[i+1] in globals() # execute the setting - # Save the defaults for later comparisons, including the -O changes. This way - # we only pass the relevant -s flags that actually change things after -O to emcc - # in the test runner - Settings.defaults = copy.copy(Settings.__dict__) - # Transforms the Settings information into emcc-compatible args (-s X=Y, etc.). Basically # the reverse of load_settings, except for -Ox which is relevant there but not here @classmethod @@ -320,9 +315,7 @@ class Settings: for key, value in Settings.__dict__.iteritems(): if key == key.upper(): # this is a hack. all of our settings are ALL_CAPS, python internals are not jsoned = json.dumps(value) - # Only add if it actually modifies a default - if key not in Settings.defaults or jsoned != json.dumps(Settings.defaults[key]): - ret += ['-s', key + '=' + jsoned] + ret += ['-s', key + '=' + jsoned] return ret @classmethod |