Changeset 148126 in webkit

Timestamp:

Apr 10, 2013 12:24:46 PM (11 years ago)

Author:

glenn@skynav.com

Message:

[Qt] Fix regression to test-webkitpy.
​https://bugs.webkit.org/show_bug.cgi?id=114368

Reviewed by Ryosuke Niwa.

• Scripts/webkitpy/layout_tests/port/factory.py:

(PortFactory._default_port): Return qt-linux instead of chromium-linux as default port for linux/freebsd.
(PortFactory.get): Remove obsolete chromium port related code.

• Scripts/webkitpy/layout_tests/port/mac.py:

(MacPort.default_child_processes): Prevent type error if can't determine total memory.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/factory.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/mac.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-04-10  Glenn Adams  <glenn@skynav.com>
+
+        [Qt] Fix regression to test-webkitpy.
+        https://bugs.webkit.org/show_bug.cgi?id=114368
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/webkitpy/layout_tests/port/factory.py:
+        (PortFactory._default_port): Return qt-linux instead of chromium-linux as default port for linux/freebsd.
+        (PortFactory.get): Remove obsolete chromium port related code.
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        (MacPort.default_child_processes): Prevent type error if can't determine total memory.
+
 2013-04-10  Anders Carlsson  <andersca@apple.com>
 

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

@@ -90 +90 @@
         platform = self._host.platform
         if platform.is_linux() or platform.is_freebsd():
-            return 'chromium-linux'
+            return 'qt-linux'
         elif platform.is_mac():
             return 'mac'
@@ -102 +102 @@
         appropriate port on this platform."""
         port_name = port_name or self._default_port(options)
-
-        # FIXME(dpranke): We special-case '--platform chromium' so that it can co-exist
-        # with '--platform chromium-mac' and '--platform chromium-linux' properly (we
-        # can't look at the port_name prefix in this case).
-        if port_name == 'chromium':
-            port_name = 'chromium-' + self._host.platform.os_name
 
         for port_class in self.PORT_CLASSES:

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

@@ -125 +125 @@
         # Make sure we have enough ram to support that many instances:
         total_memory = self.host.platform.total_bytes_memory()
-        bytes_per_drt = 256 * 1024 * 1024  # Assume each DRT needs 256MB to run.
-        overhead = 2048 * 1024 * 1024  # Assume we need 2GB free for the O/S
-        supportable_instances = max((total_memory - overhead) / bytes_per_drt, 1)  # Always use one process, even if we don't have space for it.
-        if supportable_instances < default_count:
-            _log.warning("This machine could support %s child processes, but only has enough memory for %s." % (default_count, supportable_instances))
+        if total_memory:
+            bytes_per_drt = 256 * 1024 * 1024  # Assume each DRT needs 256MB to run.
+            overhead = 2048 * 1024 * 1024  # Assume we need 2GB free for the O/S
+            supportable_instances = max((total_memory - overhead) / bytes_per_drt, 1)  # Always use one process, even if we don't have space for it.
+            if supportable_instances < default_count:
+                _log.warning("This machine could support %s child processes, but only has enough memory for %s." % (default_count, supportable_instances))
+        else:
+            _log.warning("Cannot determine available memory for child processes, using default child process count of %s." % default_count)
+            supportable_instances = default_count
         return min(supportable_instances, default_count)