[android] Pass SIGTERM from logdog_wrapper to its wrapped test command.

build/android/test_wrapper/logdog_wrapper.py

Index: build/android/test_wrapper/logdog_wrapper.py
diff --git a/build/android/test_wrapper/logdog_wrapper.py b/build/android/test_wrapper/logdog_wrapper.py
index 6daea499d4341a039b92aad50467317d6d7ed6fd..9d1a8296c62426e0acc184d3afae92c221f41575 100755
--- a/build/android/test_wrapper/logdog_wrapper.py
+++ b/build/android/test_wrapper/logdog_wrapper.py
@@ -8,6 +8,7 @@
 import argparse
 import logging
 import os
+import signal
 import subprocess
 import sys
 import urllib
@@ -39,13 +40,26 @@ def CreateUrl(server, project, prefix, name):
   return 'https://%s/v/?s=%s' % (server, urllib.quote_plus(stream_name))
 
 
+def CreateSignalForwarder(proc):
+  def handler(signum, _frame):
+    proc.send_signal(signum)

[bpastene, 2016/10/27 17:46:14]

Not sure where this logs to, but maybe log that it passed on the signal?

[jbudorick, 2016/10/27 18:09:07]

stdout (e.g. see the "Logcats are located at:" line at the end of
https://chromium-swarm.appspot.com/user/task/32201dbff3940910), and done.

+
+  return handler
+
+
 def main():
   parser = CommandParser()
   args, test_cmd = parser.parse_known_args(sys.argv[1:])
   logging.basicConfig(level=logging.INFO)
   if not test_cmd:
     parser.error('Must specify command to run after the logdog flags')
-  result = subprocess.call(test_cmd)
+  test_proc = subprocess.Popen(test_cmd)
+  original_sigterm_handler = signal.signal(
+      signal.SIGTERM, CreateSignalForwarder(test_proc))
+  try:
+    result = test_proc.wait()
+  finally:
+    signal.signal(signal.SIGTERM, original_sigterm_handler)
   if '${SWARMING_TASK_ID}' in args.prefix:
     args.prefix = args.prefix.replace('${SWARMING_TASK_ID}',
                                       os.environ.get('SWARMING_TASK_ID'))