Merge pull request #76146 from swiftlang/test-timeout-error-message-2

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

Author: mikeash

test/Inputs/timeout.py

@@ -1,18 +1,29 @@
 #!/uar/bin/env python3
 
+import platform
 import subprocess
 import sys
-import threading
 
+sampleCommand = None
+timeoutSampleTime = 0
 
-def watchdog(command, timeout=None):
+if platform.system() == 'Darwin':
+    sampleCommand = '/usr/bin/sample'
+    timeoutSampleTime = 10
+
+
+def watchdog(command, timeout):
     process = subprocess.Popen(command)
-    timer = threading.Timer(timeout, process.kill)
     try:
-        timer.start()
-        process.communicate()
-    finally:
-        timer.cancel()
+        process.wait(timeout=timeout)
+    except subprocess.TimeoutExpired:
+        if sampleCommand:
+            pidstr = str(process.pid)
+            subprocess.run([sampleCommand, pidstr, str(timeoutSampleTime)])
+        process.kill()
+        sys.exit(
+            'error: command timed out after {} seconds: {}'
+            .format(timeout, ' '.join(sys.argv[2:])))
 
 
 if __name__ == '__main__':

validation-test/SILOptimizer/large_nested_array.swift.gyb

@@ -6,7 +6,11 @@
 // If the compiler needs more than 5 minutes, there is probably a real problem.
 // So please don't just increase the timeout in case this fails.
 
-// RUN: %{python} %S/../../test/Inputs/timeout.py 240 %target-swift-frontend -O -parse-as-library -sil-verify-none -c %t/main.swift -o %t/main.o
+// TEMPORARY NOTE: The timeout has been raised to 2400 seconds while we
+// investigate timeouts in CI runs of this test. This should be set back to the
+// original time of 240 seconds once that's been figured out.
+
+// RUN: %{python} %S/../../test/Inputs/timeout.py 2400 %target-swift-frontend -O -parse-as-library -sil-verify-none -c %t/main.swift -o %t/main.o
 
 // REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
 // REQUIRES: long_test