[Win] run-webkit-tests is failing to run DRT and WTR without --architecture x86_64
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jun 2020 20:09:19 +0000 (20:09 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jun 2020 20:09:19 +0000 (20:09 +0000)
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().

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263684 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 184eb6e..13a77b6 100644 (file)
@@ -1,3 +1,16 @@
+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>
 
         run-javascriptcore-tests: Support Apple Silicon running x86 processes
index 48c9b12..26c76d7 100644 (file)
@@ -153,7 +153,7 @@ class WinPort(ApplePort):
         return 'win'
 
     def _port_flag_for_scripts(self):
-        if self.get_option('architecture') == 'x86_64':
+        if self.architecture() == 'x86_64':
             return '--64-bit'
         return None
 
@@ -166,7 +166,7 @@ class WinPort(ApplePort):
         if not root_directory:
             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)
             self.set_option('_cached_root', root_directory)
@@ -216,7 +216,7 @@ class WinPort(ApplePort):
         possible_paths = [self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "10", "Debuggers", "x64", "ntsd.exe"),
             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"))
             possible_paths.append(self._filesystem.join("{0} (x86)".format(os.environ['PROGRAMFILES']), "Windows Kits", "8.0", "Debuggers", "x64", "ntsd.exe"))