Changeset 263684 in webkit

Timestamp:

Jun 29, 2020 1:09:19 PM (4 years ago)

Author:

Fujii Hironori

Message:

[Win] run-webkit-tests is failing to run DRT and WTR without --architecture x86_64
​https://bugs.webkit.org/show_bug.cgi?id=213688

Reviewed by Jonathan Bedard.

• Scripts/webkitpy/port/win.py:

(WinPort._port_flag_for_scripts):
(WinPort._build_path):
(WinPort._ntsd_location):
Replaced self.get_option('architecture') with self.architecture().

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/win.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-06-29  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] run-webkit-tests is failing to run DRT and WTR without --architecture x86_64
+        https://bugs.webkit.org/show_bug.cgi?id=213688
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/webkitpy/port/win.py:
+        (WinPort._port_flag_for_scripts):
+        (WinPort._build_path):
+        (WinPort._ntsd_location):
+        Replaced self.get_option('architecture') with self.architecture().
+
 2020-06-29  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/win.py

@@ -154 +154 @@
 
     def _port_flag_for_scripts(self):
-        if self.get_option('architecture') == 'x86_64':
+        if self.architecture() == 'x86_64':
             return '--64-bit'
         return None
@@ -167 +167 @@
             ApplePort._build_path(self, *comps)  # Sets option _cached_root
             binary_directory = 'bin32'
-            if self.get_option('architecture') == 'x86_64':
+            if self.architecture() == 'x86_64':
                 binary_directory = 'bin64'
             root_directory = self._filesystem.join(self.get_option('_cached_root'), binary_directory)
@@ -217 +217 @@
             self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.1", "Debuggers", "x64", "ntsd.exe"),
             self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.0", "Debuggers", "x64", "ntsd.exe")]
-        if self.get_option('architecture') == 'x86_64':
+        if self.architecture() == 'x86_64':
             possible_paths.append(self._filesystem.join("{0} (x86)".format(os.environ['PROGRAMFILES']), "Windows Kits", "10", "Debuggers", "x64", "ntsd.exe"))
             possible_paths.append(self._filesystem.join("{0} (x86)".format(os.environ['PROGRAMFILES']), "Windows Kits", "8.1", "Debuggers", "x64", "ntsd.exe"))