aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/python_utils
diff options
context:
space:
mode:
authorGravatar Matt Kwong <mattkwong@google.com>2017-08-24 12:35:04 -0700
committerGravatar Matt Kwong <mattkwong@google.com>2017-08-24 12:35:04 -0700
commit3da8c5defbc9a83d3db0bf84fb0dce012802d9b3 (patch)
treef9aa6c22336d1fd64e39fa79bd8d3ab922252cff /tools/run_tests/python_utils
parent5920abc5358e854a0f4a2217bf8be230977d1853 (diff)
Let alarms at end of jobset.py trigger isntead of clearing
Diffstat (limited to 'tools/run_tests/python_utils')
-rwxr-xr-xtools/run_tests/python_utils/jobset.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py
index 044c6f3aa4..50fe7d7df8 100755
--- a/tools/run_tests/python_utils/jobset.py
+++ b/tools/run_tests/python_utils/jobset.py
@@ -473,8 +473,10 @@ class Jobset(object):
while self._running:
if self.cancelled(): pass # poll cancellation
self.reap()
- if platform_string() != 'windows':
- signal.alarm(0)
+ global have_alarm
+ if platform_string() != 'windows' and have_alarm:
+ signal.alarm(1)
+ signal.pause()
return not self.cancelled() and self._failures == 0