Changeset 263610 in webkit

Timestamp:

Jun 26, 2020 9:37:12 PM (4 years ago)

Author:

Jonathan Bedard

Message:

[webkitpy] Allow callers to override the reported model (Part 1)
​https://bugs.webkit.org/show_bug.cgi?id=213677
<rdar://problem/64834043>

Reviewed by Dewei Zhu.

• Scripts/webkitpy/port/base.py:

(Port.configuration_for_upload): Set the model based on --model.

• Scripts/webkitpy/port/factory.py:

(configuration_options): Add --model option, drive-by fix for --architecture.

• Scripts/webkitpy/port/mac.py:

(MacPort.configuration_for_upload): --model overrides detected model.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (1 diff)
• Scripts/webkitpy/port/factory.py (modified) (1 diff)
• Scripts/webkitpy/port/mac.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-06-26  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Allow callers to override the reported model (Part 1)
+        https://bugs.webkit.org/show_bug.cgi?id=213677
+        <rdar://problem/64834043>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port.configuration_for_upload): Set the model based on --model.
+        * Scripts/webkitpy/port/factory.py:
+        (configuration_options): Add --model option, drive-by fix for --architecture.
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.configuration_for_upload): --model overrides detected model.
+
 2020-06-26  Jonathan Bedard  <jbedard@apple.com>
 

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

@@ -1579 +1579 @@
             sdk=host.platform.build_version(),
             flavor=self.get_option('result_report_flavor'),
+            model=self.get_option('model'),
         )
 

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

@@ -88 +88 @@
         optparse.make_option('--arm', action='store_const', const='arm64e', default=None, dest="architecture",
              help='Use arm64e binaries by default'),
-        optparse.make_option('--architecture', action='store_const', const='x86', default=None, dest="architecture",
+        optparse.make_option('--architecture', action='store', default=None, dest="architecture",
              help='Use binaries of the specified architecture by default.'),
+        # FIXME https://bugs.webkit.org/213677: This should effect the models used by simulator ports
+        optparse.make_option('--model', action='store', default=None, dest="model",
+             help='Override the model details on upload.'),
     ]
 

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

@@ -293 +293 @@
         configuration = super(MacPort, self).configuration_for_upload(host=host)
 
-        output = host.executive.run_command(['/usr/sbin/sysctl', 'hw.model']).rstrip()
-        match = re.match(r'hw.model: (?P<model>.*)', output)
-        if match:
-            configuration['model'] = match.group('model')
+        # --model should override the detected model
+        if not configuration.get('model'):
+            output = host.executive.run_command(['/usr/sbin/sysctl', 'hw.model']).rstrip()
+            match = re.match(r'hw.model: (?P<model>.*)', output)
+            if match:
+                configuration['model'] = match.group('model')
 
         return configuration