Change use of NO_DYNAMIC_EXECUTION in embind to DYNAMIC_EXECUTION. #7653
Conversation
wffurr
force-pushed
the
embind-dynamic-execution
branch
2 times, most recently
from
d7f762e to
c183a9a
Compare
tests/test_other.py
Outdated
| @@ -2399,6 +2399,10 @@ def test_embind(self): | |||
| if fail: | |||
| self.assertNotEqual(proc.returncode, 0) | |||
| else: | |||
| if 'DYNAMIC_EXECUTION=0' in args: | |||
| output = run_js(self.in_dir('a.out.js'), stdout=PIPE, stderr=PIPE, assert_returncode=0, engine=NODE_JS, | |||
| shell_args=['--disallow-code-generation-from-strings']) | |||
There was a problem hiding this comment.
Looks like this test fails on CI, but it passes for me locally. Perhaps this flag is just present in some versions of node.js?
There was a problem hiding this comment.
It may be safer to just scan the output for eval( and new Function.
There was a problem hiding this comment.
Yes, running locally with Node 8.9.1 (the version used by CircleCI) produces:
/usr/local/google/home/wfurr/Projects/node-v8.9.1-linux-x64/bin/node: bad option: --disallow-code-generation-from-strings
There was a problem hiding this comment.
Changed to string check output per your suggestion. It has to be "new Function(" because "new Function" appears in an error message: https://github.com/kripken/emscripten/blob/incoming/src/embind/embind.js#L852
wffurr
force-pushed
the
embind-dynamic-execution
branch
2 times, most recently
from
2b009e4 to
977e817
Compare
Adds a check for uses of 'new Function(' and 'eval(' to test_embind with
DYNAMIC_EXECUTION=0.
wffurr
force-pushed
the
embind-dynamic-execution
branch
from
977e817 to
0feb61b
Compare
Adds a validation step to the nodejs command when running the tests with DYNAMIC_EXECUTION=0 to ensure the generated script has no eval. This required adding the ability to specify args to the nodejs command to jsrun.py.
The existing tests didn't catch this bug because they were also affected. The tests check for Module['NO_DYNAMIC_EXECUTION'] which was set by embind.js for the test harness when the NO_DYNAMIC_EXECUTION=1 flag was set.