diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-12-07 10:37:25 -0500 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-12-07 10:37:25 -0500 |
| commit | 1a007b1631509b9d72499a8f4402294017ee04dc (patch) | |
| tree | 92f8b0341497c7bd4e53aa82c690346536a244c3 /tools/jsrun.py | |
| parent | df11c6f1fd1636a355b83a1c48b3a890596e6a32 (diff) | |
| parent | eb083723747a90cb6ab9853fec8d6e8ef54748bc (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'tools/jsrun.py')
| -rw-r--r-- | tools/jsrun.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/jsrun.py b/tools/jsrun.py index 7acfc978..f74a1492 100644 --- a/tools/jsrun.py +++ b/tools/jsrun.py @@ -3,7 +3,7 @@ from subprocess import Popen, PIPE, STDOUT TRACK_PROCESS_SPAWNS = True if (os.getenv('EM_BUILD_VERBOSE') and int(os.getenv('EM_BUILD_VERBOSE')) >= 3) else False -def timeout_run(proc, timeout, note='unnamed process', full_output=False): +def timeout_run(proc, timeout=None, note='unnamed process', full_output=False): start = time.time() if timeout is not None: while time.time() - start < timeout and proc.poll() is None: |