Changeset 283329 in webkit

Timestamp:

Sep 30, 2021, 1:13:18 PM (5 years ago)

Author:

Fujii Hironori

Message:

Python 3 fails to run run-builtins-generator-tests : ModuleNotFoundError: No module named 'builtins_model'
​https://bugs.webkit.org/show_bug.cgi?id=230870

Reviewed by Jonathan Bedard.

Source/JavaScriptCore:

BaseException.message has been deprecated as of Python 2.6. Use
str(e) instead.

Implicit relative imports have been deprecated in Python 3.
Basically, relative imports should be used. However, the scripts
in wkbuiltins directory are flattened when they are copied to
WebKitBuild directory. So, relative imports can't be used.

So, append wkbuiltins directory to sys.path as a workaround.

• Scripts/generate-js-builtins.py:

Tools:

After r282424 (Bug 229879) switched to python3 for running
run-builtins-generator-tests on Buildbot, only WinCairo buildbot
was failing run-builtins-generator-tests.

run-builtins-generator-tests was invoking generate-js-builtins.py
explictly with 'python'. This is Python 2 on other bots.

Use sys.executable instead of 'python' to invoke
generate-js-builtins.py.

• Scripts/webkitpy/codegen/main.py:

(BuiltinsGeneratorTests.generate_from_js_builtins):

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/Scripts/generate-js-builtins.py (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/codegen/main.py (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-09-30  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Python 3 fails to run run-builtins-generator-tests : ModuleNotFoundError: No module named 'builtins_model'
+        https://bugs.webkit.org/show_bug.cgi?id=230870
+
+        Reviewed by Jonathan Bedard.
+
+        BaseException.message has been deprecated as of Python 2.6. Use
+        str(e) instead.
+
+        Implicit relative imports have been deprecated in Python 3.
+        Basically, relative imports should be used. However, the scripts
+        in wkbuiltins directory are flattened when they are copied to
+        WebKitBuild directory. So, relative imports can't be used.
+
+        So, append wkbuiltins directory to sys.path as a workaround.
+
+        * Scripts/generate-js-builtins.py:
+
 2021-09-29  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/Scripts/generate-js-builtins.py

@@ -33 +33 @@
 import os
 import sys
+
+sys.path.append(os.path.join(os.path.dirname(__file__), 'wkbuiltins'))
 
 logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.ERROR)
@@ -179 +181 @@
     except ParseException as e:
         if arg_options.test:
-            log.error(e.message)
+            log.error(str(e))
         else:
             raise  # Force the build to fail.

trunk/Tools/ChangeLog

@@ +1 @@
+2021-09-30  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Python 3 fails to run run-builtins-generator-tests : ModuleNotFoundError: No module named 'builtins_model'
+        https://bugs.webkit.org/show_bug.cgi?id=230870
+
+        Reviewed by Jonathan Bedard.
+
+        After r282424 (Bug 229879) switched to python3 for running
+        run-builtins-generator-tests on Buildbot, only WinCairo buildbot
+        was failing run-builtins-generator-tests.
+
+        run-builtins-generator-tests was invoking generate-js-builtins.py
+        explictly with 'python'. This is Python 2 on other bots.
+
+        Use sys.executable instead of 'python' to invoke
+        generate-js-builtins.py.
+
+        * Scripts/webkitpy/codegen/main.py:
+        (BuiltinsGeneratorTests.generate_from_js_builtins):
+
 2021-09-30  John Wilander  <wilander@apple.com>
 

trunk/Tools/Scripts/webkitpy/codegen/main.py

@@ -27 +27 @@
 import os.path
 import shutil
+import sys
 import tempfile
 from webkitpy.common.checkout.scm.detection import detect_scm_system
@@ -39 +40 @@
 
     def generate_from_js_builtins(self, builtins_files, output_directory, framework_name="", combined_outputs=False, generate_wrappers=False):
-        cmd = ['python',
+        cmd = [sys.executable,
                'JavaScriptCore/Scripts/generate-js-builtins.py',
                '--output-directory', output_directory,