aboutsummaryrefslogtreecommitdiff
path: root/tests/runner.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-09 20:34:37 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-09 20:34:37 -0700
commitf58e77da332cb0f8123c0c062c275c63783736a7 (patch)
tree518251ccf13fd13e62604306f0e121034a79f82d /tests/runner.py
parent064206f86c62c546b1860cb14e4f303b6056b5bc (diff)
make noInitialRun and INVOKE_RUN refer to main(), not run(). run() need not call main(), and is necessary to set things up even if you call main() manually
Diffstat (limited to 'tests/runner.py')
-rwxr-xr-xtests/runner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/runner.py b/tests/runner.py
index 982b6899..325ecdb5 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -10016,7 +10016,7 @@ f.close()
self.assertNotContained('pre-run\nhello from main\npost-run\n', run_js(os.path.join(self.get_dir(), 'a.out.js')))
# noInitialRun prevents run
- for no_initial_run, run_dep in [(0, 0), (1, 0), (0, 1), (1, 1)]:
+ for no_initial_run, run_dep in [(0, 0), (1, 0), (0, 1)]:
print no_initial_run, run_dep
Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'main.cpp')]).communicate()
src = 'var Module = { noInitialRun: %d };\n' % no_initial_run + open(os.path.join(self.get_dir(), 'a.out.js')).read()