Log Message
[run-webkit-tests] Use Python 3 (Part 2) https://bugs.webkit.org/show_bug.cgi?id=226658 <rdar://problem/78882016>
Reviewed by Aakash Jain. * CISupport/build-webkit-org/steps.py: (RunWebKitTests): Change invocation to Python 3. * CISupport/build-webkit-org/steps_unittest.py: * CISupport/kill-old-processes: (main): run-webkit-tests may be invoked with Python 3.
Modified Paths
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (281626 => 281627)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-08-26 16:24:23 UTC (rev 281626)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-08-26 16:25:19 UTC (rev 281627)
@@ -531,7 +531,7 @@
description = ["layout-tests running"]
descriptionDone = ["layout-tests"]
resultDirectory = "layout-test-results"
- command = ["python", "./Tools/Scripts/run-webkit-tests",
+ command = ["python3", "./Tools/Scripts/run-webkit-tests",
"--no-build",
"--no-show-results",
"--no-new-test-results",
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (281626 => 281627)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-08-26 16:24:23 UTC (rev 281626)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-08-26 16:25:19 UTC (rev 281627)
@@ -793,7 +793,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=False,
- command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+ command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
'--no-new-test-results', '--clobber-old-results',
'--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
'--build-number', '101', '--buildbot-worker', 'ews100',
@@ -817,7 +817,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=False,
- command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+ command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
'--no-new-test-results', '--clobber-old-results',
'--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
'--build-number', '101', '--buildbot-worker', 'ews100',
@@ -844,7 +844,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=False,
- command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+ command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
'--no-new-test-results', '--clobber-old-results',
'--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
'--build-number', '101', '--buildbot-worker', 'ews100',
@@ -869,7 +869,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=False,
- command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+ command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
'--no-new-test-results', '--clobber-old-results',
'--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
'--build-number', '101', '--buildbot-worker', 'ews100',
@@ -894,7 +894,7 @@
workdir='wkdir',
timeout=1200,
logEnviron=False,
- command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+ command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
'--no-new-test-results', '--clobber-old-results',
'--builder-name', 'iOS-14-Simulator-WK2-Tests-EWS',
'--build-number', '101', '--buildbot-worker', 'ews100',
@@ -936,7 +936,7 @@
ExpectShell(
workdir='wkdir',
logEnviron=False,
- command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+ command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
'--no-new-test-results', '--clobber-old-results',
'--builder-name', 'Apple-iOS-14-Simulator-Debug-Build',
'--build-number', '101', '--buildbot-worker', 'bot100',
@@ -959,7 +959,7 @@
ExpectShell(
workdir='wkdir',
logEnviron=False,
- command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+ command=['python3', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
'--no-new-test-results', '--clobber-old-results',
'--builder-name', 'Apple-iOS-14-Simulator-Debug-Build',
'--build-number', '101', '--buildbot-worker', 'bot100',
Modified: trunk/Tools/CISupport/kill-old-processes (281626 => 281627)
--- trunk/Tools/CISupport/kill-old-processes 2021-08-26 16:24:23 UTC (rev 281626)
+++ trunk/Tools/CISupport/kill-old-processes 2021-08-26 16:25:19 UTC (rev 281627)
@@ -171,7 +171,7 @@
else:
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")
+ os.system("ps aux | grep -E '.+/Python3? .+(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
# 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 {} +')
@@ -183,7 +183,7 @@
builddir_bin = "WebKitBuild/Release/bin" if os.path.isdir("WebKitBuild/Release/bin") else "WebKitBuild/Debug/bin"
for task in tasksToKill + taskToKillUnix + listAllWebKitPrograms(builddir_bin):
os.system("killall -9 -v " + task)
- os.system("ps aux | grep -P '.+/python .+(run_webkit_tests|run-webkit-tests|mod_pywebsocket)' | grep -v grep | awk '{print $2}' | xargs -r kill")
+ os.system("ps aux | grep -P '.+/python3? .+(run_webkit_tests|run-webkit-tests|mod_pywebsocket)' | grep -v grep | awk '{print $2}' | xargs -r kill")
removeOrphanShmSegments()
else:
sys.exit()
Modified: trunk/Tools/ChangeLog (281626 => 281627)
--- trunk/Tools/ChangeLog 2021-08-26 16:24:23 UTC (rev 281626)
+++ trunk/Tools/ChangeLog 2021-08-26 16:25:19 UTC (rev 281627)
@@ -1,3 +1,17 @@
+2021-08-26 Jonathan Bedard <jbed...@apple.com>
+
+ [run-webkit-tests] Use Python 3 (Part 2)
+ https://bugs.webkit.org/show_bug.cgi?id=226658
+ <rdar://problem/78882016>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/build-webkit-org/steps.py:
+ (RunWebKitTests): Change invocation to Python 3.
+ * CISupport/build-webkit-org/steps_unittest.py:
+ * CISupport/kill-old-processes:
+ (main): run-webkit-tests may be invoked with Python 3.
+
2021-08-25 Wenson Hsieh <wenson_hs...@apple.com>
Remove some iOS-specific compile-time guards that are no longer needed
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
