diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-09-06 18:34:38 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-09-06 18:34:38 -0700 |
| commit | 38890204ed1f5f8dd34cced7c42fc9cf42dccab5 (patch) | |
| tree | 0b6d76adc047a0c81c9e0caf0dbbae93c5461948 /tools/jsrun.py | |
| parent | b5b49215d4a40566380a769f47a9c1cce74a28b0 (diff) | |
| parent | fce749a7066e51d57967889fab0600c285885b4b (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'tools/jsrun.py')
| -rw-r--r-- | tools/jsrun.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/jsrun.py b/tools/jsrun.py index 91038f6e..6f77ce51 100644 --- a/tools/jsrun.py +++ b/tools/jsrun.py @@ -10,6 +10,7 @@ def timeout_run(proc, timeout, note='unnamed process', full_output=False): proc.kill() # XXX bug: killing emscripten.py does not kill it's child process! raise Exception("Timed out: " + note) out = proc.communicate() + out = map(lambda o: '' if o is None else o, out) return '\n'.join(out) if full_output else out[0] def run_js(filename, engine=None, args=[], check_timeout=False, stdin=None, stdout=PIPE, stderr=None, cwd=None, full_output=False): |