Changeset 277444 in webkit

Timestamp:

May 13, 2021, 12:23:58 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[run-api-tests] Use Python 3 (Part 1)
​https://bugs.webkit.org/show_bug.cgi?id=225427
<rdar://problem/77584713>

Reviewed by Aakash Jain.

• CISupport/build-webkit-org/steps.py:

(RunAPITests): Use Python3 to invoke run-api-tests.

• CISupport/ews-build/steps.py:

(RunAPITests): Use Python3 to invoke run-api-tests.

• CISupport/ews-build/steps_unittest.py:

Location:

trunk/Tools

Files:

• CISupport/build-webkit-org/steps.py (modified) (1 diff)
• CISupport/ews-build/steps.py (modified) (1 diff)
• CISupport/ews-build/steps_unittest.py (modified) (8 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/CISupport/build-webkit-org/steps.py

@@ -645 +645 @@
     logfiles = {"json": jsonFileName}
     command = [
-        "python",
+        "python3",
         "./Tools/Scripts/run-api-tests",
         "--no-build",

trunk/Tools/CISupport/ews-build/steps.py

@@ -2766 +2766 @@
     jsonFileName = 'api_test_results.json'
     logfiles = {'json': jsonFileName}
-    command = ['python', 'Tools/Scripts/run-api-tests', '--no-build',
+    command = ['python3', 'Tools/Scripts/run-api-tests', '--no-build',
                WithProperties('--%(configuration)s'), '--verbose', '--json-output={0}'.format(jsonFileName)]
     failedTestsFormatString = '%d api test%s failed or timed out'

trunk/Tools/CISupport/ews-build/steps_unittest.py

@@ -3182 +3182 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--release', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+                        command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--release', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
                         logfiles={'json': self.jsonFileName},
                         )
@@ -3210 +3210 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName), '--ios-simulator'],
+                        command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName), '--ios-simulator'],
                         logfiles={'json': self.jsonFileName},
                         )
@@ -3271 +3271 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+                        command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
                         logfiles={'json': self.jsonFileName},
                         )
@@ -3313 +3313 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+                        command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
                         logfiles={'json': self.jsonFileName},
                         )
@@ -3369 +3369 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+                        command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
                         logfiles={'json': self.jsonFileName},
                         )
@@ -3387 +3387 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+                        command=['python3', 'Tools/Scripts/run-api-tests', '--no-build', '--debug', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
                         logfiles={'json': self.jsonFileName},
                         )
@@ -3429 +3429 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python',
+                        command=['python3',
                                  'Tools/Scripts/run-api-tests',
                                  '--no-build',
@@ -3465 +3465 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python',
+                        command=['python3',
                                  'Tools/Scripts/run-api-tests',
                                  '--no-build',

trunk/Tools/ChangeLog

@@ +1 @@
+2021-05-13  Jonathan Bedard  <jbedard@apple.com>
+
+        [run-api-tests] Use Python 3 (Part 1)
+        https://bugs.webkit.org/show_bug.cgi?id=225427
+        <rdar://problem/77584713>
+
+        Reviewed by Aakash Jain.
+
+        * CISupport/build-webkit-org/steps.py:
+        (RunAPITests): Use Python3 to invoke run-api-tests.
+        * CISupport/ews-build/steps.py:
+        (RunAPITests): Use Python3 to invoke run-api-tests.
+        * CISupport/ews-build/steps_unittest.py:
+
 2021-05-13  Jonathan Bedard  <jbedard@apple.com>