Title: [280621] trunk/Tools
Revision
280621
Author
jbed...@apple.com
Date
2021-08-03 16:14:44 -0700 (Tue, 03 Aug 2021)

Log Message

[build.webkit.org] Simulator temp files filling up disk (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=228335
<rdar://problem/81171840>

Reviewed by Ryan Haddad.

* CISupport/kill-old-processes:
(main): Use tempdir environment variable, link to underlying bug.

Modified Paths

Diff

Modified: trunk/Tools/CISupport/kill-old-processes (280620 => 280621)


--- trunk/Tools/CISupport/kill-old-processes	2021-08-03 22:52:11 UTC (rev 280620)
+++ trunk/Tools/CISupport/kill-old-processes	2021-08-03 23:14:44 UTC (rev 280621)
@@ -28,6 +28,7 @@
 import getpass
 import re
 import subprocess
+import tempfile
 
 def listAllWebKitPrograms(builddir_bin):
     foundWebKitPrograms = []
@@ -172,8 +173,8 @@
             os.system("xcrun simctl shutdown booted")
         # Kill all instances of python executing run-webkit-tests
         os.system("ps aux | grep -E '.+/Python .+(run_webkit_tests|run-webkit-tests|mod_pywebsocket)' | grep -v grep | awk '{print $2}' | xargs kill")
-        # Remove stale simulator temp files
-        os.system('find /private/var/folders -name "Deleting-*" -maxdepth 4 -exec sudo rm -rf {} +')
+        # FIXME: <rdar://problem/81476546> Remove stale simulator temp files
+        os.system('find {} -name "Deleting-*" -maxdepth 1 -exec sudo rm -rf {{}} +'.format(tempfile.gettempdir()))
     elif sys.platform == 'cygwin' or sys.platform == 'win32':
         for task in tasksToKill + tasksToKillWin:
             os.system("taskkill /t /f /im " + task)

Modified: trunk/Tools/ChangeLog (280620 => 280621)


--- trunk/Tools/ChangeLog	2021-08-03 22:52:11 UTC (rev 280620)
+++ trunk/Tools/ChangeLog	2021-08-03 23:14:44 UTC (rev 280621)
@@ -1,3 +1,14 @@
+2021-08-03  Jonathan Bedard  <jbed...@apple.com>
+
+        [build.webkit.org] Simulator temp files filling up disk (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=228335
+        <rdar://problem/81171840>
+
+        Reviewed by Ryan Haddad.
+
+        * CISupport/kill-old-processes:
+        (main): Use tempdir environment variable, link to underlying bug.
+
 2021-08-03  Jer Noble  <jer.no...@apple.com>
 
         WebKitTestRunner should dump current results in the case of a timeout
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to