Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (89030 => 89031)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-16 16:18:23 UTC (rev 89031)
@@ -1,3 +1,15 @@
+2011-06-16 Torsten Kurbad <[email protected]>
+
+ Reviewed by Eric Seidel.
+
+ Add support for sys.platform == 'linux3' by relaxing
+ conditional statements and/or extending lookup dicts.
+ This way, Linux kernels >=3.0-rc1 get supported in the
+ build process.
+ https://bugs.webkit.org/show_bug.cgi?id=62730
+
+ * gyp_webkit:
+
2011-06-16 Sheriff Bot <[email protected]>
Unreviewed, rolling out r89025.
Modified: trunk/Source/WebKit/chromium/gyp_webkit (89030 => 89031)
--- trunk/Source/WebKit/chromium/gyp_webkit 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Source/WebKit/chromium/gyp_webkit 2011-06-16 16:18:23 UTC (rev 89031)
@@ -90,7 +90,7 @@
args.append('--no-circular-check')
# On linux, we want gyp to output a makefile (default is scons).
- if sys.platform == 'linux2':
+ if sys.platform.startswith('linux'):
args.extend(['-fmake',
'--suffix=.chromium',
'--toplevel-dir=../../..',
Modified: trunk/Tools/ChangeLog (89030 => 89031)
--- trunk/Tools/ChangeLog 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/ChangeLog 2011-06-16 16:18:23 UTC (rev 89031)
@@ -1,3 +1,25 @@
+2011-06-16 Torsten Kurbad <[email protected]>
+
+ Reviewed by Eric Seidel.
+
+ Add support for sys.platform == 'linux3' by relaxing
+ conditional statements and/or extending lookup dicts.
+ This way, Linux kernels >=3.0-rc1 get supported in the
+ build process.
+ https://bugs.webkit.org/show_bug.cgi?id=62730
+
+ * Scripts/webkitpy/common/system/executive.py:
+ * Scripts/webkitpy/common/system/file_lock.py:
+ * Scripts/webkitpy/common/system/path_unittest.py:
+ * Scripts/webkitpy/layout_tests/layout_package/manager.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/factory.py:
+ * Scripts/webkitpy/layout_tests/port/factory_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
2011-06-16 Sheriff Bot <[email protected]>
Unreviewed, rolling out r88796.
Modified: trunk/Tools/Scripts/webkitpy/common/system/executive.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/common/system/executive.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -275,7 +275,7 @@
def check_running_pid(self, pid):
"""Return True if pid is alive, otherwise return False."""
- if sys.platform in ('darwin', 'linux2', 'cygwin'):
+ if sys.platform.startswith('linux') or sys.platform in ('darwin', 'cygwin'):
try:
os.kill(pid, 0)
return True
Modified: trunk/Tools/Scripts/webkitpy/common/system/file_lock.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/common/system/file_lock.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/common/system/file_lock.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -43,7 +43,7 @@
self._max_wait_time_sec = max_wait_time_sec
def _create_lock(self):
- if sys.platform in ('darwin', 'linux2', 'cygwin'):
+ if sys.platform.startswith('linux') or sys.platform in ('darwin', 'cygwin'):
import fcntl
fcntl.flock(self._lock_file_descriptor, fcntl.LOCK_EX | fcntl.LOCK_NB)
elif sys.platform == 'win32':
@@ -51,7 +51,7 @@
msvcrt.locking(self._lock_file_descriptor, msvcrt.LK_NBLCK, 32)
def _remove_lock(self):
- if sys.platform in ('darwin', 'linux2', 'cygwin'):
+ if sys.platform.startswith('linux') or sys.platform in ('darwin', 'cygwin'):
import fcntl
fcntl.flock(self._lock_file_descriptor, fcntl.LOCK_UN)
elif sys.platform == 'win32':
Modified: trunk/Tools/Scripts/webkitpy/common/system/path_unittest.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/common/system/path_unittest.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/common/system/path_unittest.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -65,6 +65,9 @@
self.assertEqual(path.abspath_to_uri("/foo/bar.html",
platform='linux2'),
"file:///foo/bar.html")
+ self.assertEqual(path.abspath_to_uri("/foo/bar.html",
+ platform='linux3'),
+ "file:///foo/bar.html")
def test_abspath_to_uri_win(self):
self.assertMatch('c:\\foo\\bar.html',
@@ -81,6 +84,9 @@
self.assertMatch('/foo/bar + baz%?.html',
'file:///foo/bar%20+%20baz%25%3F.html',
platform='linux2')
+ self.assertMatch('/foo/bar + baz%?.html',
+ 'file:///foo/bar%20+%20baz%25%3F.html',
+ platform='linux3')
# Note that you can't have '?' in a filename on windows.
self.assertMatch('/cygdrive/c/foo/bar + baz%.html',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -504,7 +504,7 @@
# turn shard the http tests there as well. Switching to apache is
# what made them stable on linux/mac.
return_value = directory
- while ((directory != 'http' or sys.platform in ('darwin', 'linux2'))
+ while ((directory != 'http' or sys.platform == 'darwin' or sys.platform.startswith('linux'))
and test_file.find(self._fs.sep) >= 0):
test_file_parts = test_file.split(self._fs.sep, 1)
directory = test_file_parts[0]
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -41,7 +41,7 @@
if port_name == 'chromium-gpu':
if platform in ('cygwin', 'win32'):
port_name = 'chromium-gpu-win'
- elif platform == 'linux2':
+ elif platform.startswith('linux'):
port_name = 'chromium-gpu-linux'
elif platform == 'darwin':
port_name = 'chromium-gpu-mac'
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -43,6 +43,7 @@
def test_get_chromium_gpu__on_linux(self):
self.assertOverridesWorked('chromium-gpu-linux', 'chromium-gpu', 'linux2')
+ self.assertOverridesWorked('chromium-gpu-linux', 'chromium-gpu', 'linux3')
def test_get_chromium_gpu__on_mac(self):
self.assertOverridesWorked('chromium-gpu-mac', 'chromium-gpu', 'darwin')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -37,7 +37,7 @@
class ChromiumLinuxPortTest(port_testcase.PortTestCase):
def port_maker(self, platform):
- if platform != 'linux2':
+ if not platform.startswith('linux'):
return None
return chromium_linux.ChromiumLinuxPort
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -66,7 +66,7 @@
port_to_use = 'chromium-win'
else:
port_to_use = 'win'
- elif sys.platform == 'linux2':
+ elif sys.platform.startswith('linux'):
port_to_use = 'chromium-linux'
elif sys.platform == 'darwin':
if options and hasattr(options, 'chromium') and options.chromium:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -144,6 +144,8 @@
self.assert_port("chromium-linux", chromium_linux.ChromiumLinuxPort)
self.assert_platform_port("linux2", self.chromium_options,
chromium_linux.ChromiumLinuxPort)
+ self.assert_platform_port("linux3", self.chromium_options,
+ chromium_linux.ChromiumLinuxPort)
def test_chromium_win(self):
self.assert_port("chromium-win", chromium_win.ChromiumWinPort)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -49,7 +49,7 @@
def baseline_search_path(self):
port_names = []
- if sys.platform == 'linux2':
+ if sys.platform.startswith('linux'):
port_names.append("qt-linux")
elif sys.platform in ('win32', 'cygwin'):
port_names.append("qt-win")
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (89030 => 89031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-06-16 16:03:15 UTC (rev 89030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-06-16 16:18:23 UTC (rev 89031)
@@ -150,7 +150,7 @@
options.pixel_tests = True
if not options.use_apache:
- options.use_apache = sys.platform in ('darwin', 'linux2')
+ options.use_apache = sys.platform.startswith('linux') or sys.platform == 'darwin'
if not options.time_out_ms:
if options.configuration == "Debug":
