- Revision
- 251661
- Author
- jbed...@apple.com
- Date
- 2019-10-28 11:43:04 -0700 (Mon, 28 Oct 2019)
Log Message
results.webkit.org: Report more descriptive configurations for non-Apple ports
https://bugs.webkit.org/show_bug.cgi?id=203490
<rdar://problem/56658244>
Reviewed by Carlos Alberto Lopez Perez.
* Scripts/webkitpy/port/gtk.py:
(GtkPort):
(GtkPort.configuration_for_upload): Return use GTK as the platform.
* Scripts/webkitpy/port/gtk_unittest.py:
(GtkPortTest):
(GtkPortTest.test_default_upload_configuration):
* Scripts/webkitpy/port/win.py:
(WinCairoPort.configuration_for_upload): Use wincairo as the platform.
* Scripts/webkitpy/port/wpe.py:
(WPEPort):
(WPEPort.configuration_for_upload): Use WPE as the platform.
* Scripts/webkitpy/port/wpe_unittest.py:
(WPEPortTest):
(WPEPortTest.test_default_upload_configuration):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (251660 => 251661)
--- trunk/Tools/ChangeLog 2019-10-28 18:26:40 UTC (rev 251660)
+++ trunk/Tools/ChangeLog 2019-10-28 18:43:04 UTC (rev 251661)
@@ -1,3 +1,26 @@
+2019-10-28 Jonathan Bedard <jbed...@apple.com>
+
+ results.webkit.org: Report more descriptive configurations for non-Apple ports
+ https://bugs.webkit.org/show_bug.cgi?id=203490
+ <rdar://problem/56658244>
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort):
+ (GtkPort.configuration_for_upload): Return use GTK as the platform.
+ * Scripts/webkitpy/port/gtk_unittest.py:
+ (GtkPortTest):
+ (GtkPortTest.test_default_upload_configuration):
+ * Scripts/webkitpy/port/win.py:
+ (WinCairoPort.configuration_for_upload): Use wincairo as the platform.
+ * Scripts/webkitpy/port/wpe.py:
+ (WPEPort):
+ (WPEPort.configuration_for_upload): Use WPE as the platform.
+ * Scripts/webkitpy/port/wpe_unittest.py:
+ (WPEPortTest):
+ (WPEPortTest.test_default_upload_configuration):
+
2019-10-28 Aakash Jain <aakash_j...@apple.com>
[ews] Improve summary for CompileWebKit and CompileJSC build step
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (251660 => 251661)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2019-10-28 18:26:40 UTC (rev 251660)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2019-10-28 18:43:04 UTC (rev 251661)
@@ -250,3 +250,9 @@
command = super(GtkPort, self).run_webkit_tests_command()
command.append("--gtk")
return command
+
+ def configuration_for_upload(self, host=None):
+ configuration = super(GtkPort, self).configuration_for_upload(host=host)
+ configuration['platform'] = 'GTK'
+ configuration['version_name'] = self._display_server.capitalize() if self._display_server else 'Xvfb'
+ return configuration
Modified: trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py (251660 => 251661)
--- trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2019-10-28 18:26:40 UTC (rev 251660)
+++ trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2019-10-28 18:43:04 UTC (rev 251661)
@@ -33,6 +33,7 @@
from webkitpy.common.system.executive_mock import MockExecutive
from webkitpy.common.system.filesystem_mock import MockFileSystem
from webkitpy.common.system.outputcapture import OutputCapture
+from webkitpy.port.config import clear_cached_configuration
from webkitpy.port.gtk import GtkPort
from webkitpy.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
from webkitpy.port import port_testcase
@@ -76,3 +77,13 @@
def test_get_crash_log(self):
# This function tested in linux_get_crash_log_unittest.py
pass
+
+ def test_default_upload_configuration(self):
+ clear_cached_configuration()
+ port = self.make_port()
+ configuration = port.configuration_for_upload()
+ self.assertEqual(configuration['architecture'], port.architecture())
+ self.assertEqual(configuration['is_simulator'], False)
+ self.assertEqual(configuration['platform'], 'GTK')
+ self.assertEqual(configuration['style'], 'release')
+ self.assertEqual(configuration['version_name'], 'Xvfb')
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (251660 => 251661)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2019-10-28 18:26:40 UTC (rev 251660)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2019-10-28 18:43:04 UTC (rev 251661)
@@ -495,7 +495,12 @@
return paths
+ def configuration_for_upload(self, host=None):
+ configuration = super(WinCairoPort, self).configuration_for_upload(host=host)
+ configuration['platform'] = self.port_name
+ return configuration
+
class FTWPort(WinPort):
port_name = "ftw"
Modified: trunk/Tools/Scripts/webkitpy/port/wpe.py (251660 => 251661)
--- trunk/Tools/Scripts/webkitpy/port/wpe.py 2019-10-28 18:26:40 UTC (rev 251660)
+++ trunk/Tools/Scripts/webkitpy/port/wpe.py 2019-10-28 18:43:04 UTC (rev 251661)
@@ -118,3 +118,8 @@
def _get_crash_log(self, name, pid, stdout, stderr, newer_than, target_host=None):
return GDBCrashLogGenerator(self._executive, name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
+
+ def configuration_for_upload(self, host=None):
+ configuration = super(WPEPort, self).configuration_for_upload(host=host)
+ configuration['platform'] = 'WPE'
+ return configuration
Modified: trunk/Tools/Scripts/webkitpy/port/wpe_unittest.py (251660 => 251661)
--- trunk/Tools/Scripts/webkitpy/port/wpe_unittest.py 2019-10-28 18:26:40 UTC (rev 251660)
+++ trunk/Tools/Scripts/webkitpy/port/wpe_unittest.py 2019-10-28 18:43:04 UTC (rev 251661)
@@ -34,6 +34,7 @@
from webkitpy.common.system.executive_mock import MockExecutive
from webkitpy.common.system.filesystem_mock import MockFileSystem
from webkitpy.common.system.outputcapture import OutputCapture
+from webkitpy.port.config import clear_cached_configuration
from webkitpy.port.wpe import WPEPort
from webkitpy.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
from webkitpy.port import port_testcase
@@ -71,3 +72,12 @@
def test_get_crash_log(self):
# This function tested in linux_get_crash_log_unittest.py
pass
+
+ def test_default_upload_configuration(self):
+ clear_cached_configuration()
+ port = self.make_port()
+ configuration = port.configuration_for_upload()
+ self.assertEqual(configuration['architecture'], port.architecture())
+ self.assertEqual(configuration['is_simulator'], False)
+ self.assertEqual(configuration['platform'], 'WPE')
+ self.assertEqual(configuration['style'], 'release')
