Merge pull request #76009 from mikeash/test-timeout-error-message

[Test] Make timeout.py signal an error when the timeout is hit.

Author: mikeash

test/Inputs/timeout.py

@@ -2,17 +2,17 @@
 
 import subprocess
 import sys
-import threading
 
 
 def watchdog(command, timeout=None):
     process = subprocess.Popen(command)
-    timer = threading.Timer(timeout, process.kill)
     try:
-        timer.start()
-        process.communicate()
-    finally:
-        timer.cancel()
+        process.communicate(timeout=timeout)
+    except subprocess.TimeoutExpired:
+        process.kill()
+        sys.exit(
+            'error: command timed out after {} seconds: {}'
+            .format(timeout, ' '.join(sys.argv[2:])))
 
 
 if __name__ == '__main__':