Title: [281515] trunk/Tools
Revision
281515
Author
jbed...@apple.com
Date
2021-08-24 14:04:08 -0700 (Tue, 24 Aug 2021)

Log Message

[kill-old-processes] Hardcode directory for stale simulator files
https://bugs.webkit.org/show_bug.cgi?id=229464
<rdar://problem/82148711>

Reviewed by Stephanie Lewis.

* CISupport/kill-old-processes:
(main):

Modified Paths

Diff

Modified: trunk/Tools/CISupport/kill-old-processes (281514 => 281515)


--- trunk/Tools/CISupport/kill-old-processes	2021-08-24 20:36:58 UTC (rev 281514)
+++ trunk/Tools/CISupport/kill-old-processes	2021-08-24 21:04:08 UTC (rev 281515)
@@ -28,7 +28,6 @@
 import getpass
 import re
 import subprocess
-import tempfile
 
 def listAllWebKitPrograms(builddir_bin):
     foundWebKitPrograms = []
@@ -174,7 +173,8 @@
         # 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")
         # FIXME: <rdar://problem/81476546> Remove stale simulator temp files
-        os.system('find {} -name "Deleting-*" -maxdepth 1 -exec sudo rm -rf {{}} +'.format(tempfile.gettempdir()))
+        # Hard-code path because when run with 'sudo,' this script doesn't get the right tempfile location
+        os.system('find /var/folders -name "Deleting-*" -maxdepth 4 -exec sudo rm -rf {} +')
     elif sys.platform == 'cygwin' or sys.platform == 'win32':
         for task in tasksToKill + tasksToKillWin:
             os.system("taskkill /t /f /im " + task)

Modified: trunk/Tools/ChangeLog (281514 => 281515)


--- trunk/Tools/ChangeLog	2021-08-24 20:36:58 UTC (rev 281514)
+++ trunk/Tools/ChangeLog	2021-08-24 21:04:08 UTC (rev 281515)
@@ -1,3 +1,14 @@
+2021-08-24  Jonathan Bedard  <jbed...@apple.com>
+
+        [kill-old-processes] Hardcode directory for stale simulator files
+        https://bugs.webkit.org/show_bug.cgi?id=229464
+        <rdar://problem/82148711>
+
+        Reviewed by Stephanie Lewis.
+
+        * CISupport/kill-old-processes:
+        (main):
+
 2021-08-24  Alex Christensen  <achristen...@webkit.org>
 
         REGRESSION (r281473): [ iOS & MacOS ] TestWebKitAPI.ProcessSwap.NavigateToInvalidURL is timing out
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to