Changeset 89031 in webkit


Ignore:
Timestamp:
Jun 16, 2011 9:18:23 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-16 Torsten Kurbad <​gentoo@tk-webart.de>

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 Torsten Kurbad <​gentoo@tk-webart.de>

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:
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r89027 r89031  
     12011-06-16  Torsten Kurbad  <gentoo@tk-webart.de>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Add support for sys.platform == 'linux3' by relaxing
     6        conditional statements and/or extending lookup dicts.
     7        This way, Linux kernels >=3.0-rc1 get supported in the
     8        build process.
     9        https://bugs.webkit.org/show_bug.cgi?id=62730
     10
     11        * gyp_webkit:
     12
    1132011-06-16  Sheriff Bot  <webkit.review.bot@gmail.com>
    214

  • trunk/Source/WebKit/chromium/gyp_webkit

    r87927 r89031  
    9191
    9292  # On linux, we want gyp to output a makefile (default is scons).
    93   if sys.platform == 'linux2':
     93  if sys.platform.startswith('linux'):
    9494    args.extend(['-fmake',
    9595                 '--suffix=.chromium',

  • trunk/Tools/ChangeLog

    r89019 r89031  
     12011-06-16  Torsten Kurbad  <gentoo@tk-webart.de>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Add support for sys.platform == 'linux3' by relaxing
     6        conditional statements and/or extending lookup dicts.
     7        This way, Linux kernels >=3.0-rc1 get supported in the
     8        build process.
     9        https://bugs.webkit.org/show_bug.cgi?id=62730
     10
     11        * Scripts/webkitpy/common/system/executive.py:
     12        * Scripts/webkitpy/common/system/file_lock.py:
     13        * Scripts/webkitpy/common/system/path_unittest.py:
     14        * Scripts/webkitpy/layout_tests/layout_package/manager.py:
     15        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
     16        * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
     17        * Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py:
     18        * Scripts/webkitpy/layout_tests/port/factory.py:
     19        * Scripts/webkitpy/layout_tests/port/factory_unittest.py:
     20        * Scripts/webkitpy/layout_tests/port/qt.py:
     21        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
     22
    1232011-06-16  Sheriff Bot  <webkit.review.bot@gmail.com>
    224

  • trunk/Tools/Scripts/webkitpy/common/system/executive.py

    r89003 r89031  
    276276    def check_running_pid(self, pid):
    277277        """Return True if pid is alive, otherwise return False."""
    278         if sys.platform in ('darwin', 'linux2', 'cygwin'):
     278        if sys.platform.startswith('linux') or sys.platform in ('darwin', 'cygwin'):
    279279            try:
    280280                os.kill(pid, 0)

  • trunk/Tools/Scripts/webkitpy/common/system/file_lock.py

    r72194 r89031  
    4444
    4545    def _create_lock(self):
    46         if sys.platform in ('darwin', 'linux2', 'cygwin'):
     46        if sys.platform.startswith('linux') or sys.platform in ('darwin', 'cygwin'):
    4747            import fcntl
    4848            fcntl.flock(self._lock_file_descriptor, fcntl.LOCK_EX | fcntl.LOCK_NB)
    … …  
    5252
    5353    def _remove_lock(self):
    54         if sys.platform in ('darwin', 'linux2', 'cygwin'):
     54        if sys.platform.startswith('linux') or sys.platform in ('darwin', 'cygwin'):
    5555            import fcntl
    5656            fcntl.flock(self._lock_file_descriptor, fcntl.LOCK_UN)

  • trunk/Tools/Scripts/webkitpy/common/system/path_unittest.py

    r70012 r89031  
    6666                                             platform='linux2'),
    6767                         "file:///foo/bar.html")
     68        self.assertEqual(path.abspath_to_uri("/foo/bar.html",
     69                                             platform='linux3'),
     70                         "file:///foo/bar.html")
    6871
    6972    def test_abspath_to_uri_win(self):
    … …  
    8285                         'file:///foo/bar%20+%20baz%25%3F.html',
    8386                         platform='linux2')
     87        self.assertMatch('/foo/bar + baz%?.html',
     88                         'file:///foo/bar%20+%20baz%25%3F.html',
     89                         platform='linux3')
    8490
    8591        # Note that you can't have '?' in a filename on windows.

  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py

    r88848 r89031  
    505505        # what made them stable on linux/mac.
    506506        return_value = directory
    507         while ((directory != 'http' or sys.platform in ('darwin', 'linux2'))
     507        while ((directory != 'http' or sys.platform == 'darwin' or sys.platform.startswith('linux'))
    508508                and test_file.find(self._fs.sep) >= 0):
    509509            test_file_parts = test_file.split(self._fs.sep, 1)

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py

    r85735 r89031  
    4242        if platform in ('cygwin', 'win32'):
    4343            port_name = 'chromium-gpu-win'
    44         elif platform == 'linux2':
     44        elif platform.startswith('linux'):
    4545            port_name = 'chromium-gpu-linux'
    4646        elif platform == 'darwin':

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py

    r79380 r89031  
    4444    def test_get_chromium_gpu__on_linux(self):
    4545        self.assertOverridesWorked('chromium-gpu-linux', 'chromium-gpu', 'linux2')
     46        self.assertOverridesWorked('chromium-gpu-linux', 'chromium-gpu', 'linux3')
    4647
    4748    def test_get_chromium_gpu__on_mac(self):

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py

    r88373 r89031  
    3838class ChromiumLinuxPortTest(port_testcase.PortTestCase):
    3939    def port_maker(self, platform):
    40         if platform != 'linux2':
     40        if not platform.startswith('linux'):
    4141            return None
    4242        return chromium_linux.ChromiumLinuxPort

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

    r85040 r89031  
    6767            else:
    6868                port_to_use = 'win'
    69         elif sys.platform == 'linux2':
     69        elif sys.platform.startswith('linux'):
    7070            port_to_use = 'chromium-linux'
    7171        elif sys.platform == 'darwin':

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py

    r78522 r89031  
    145145        self.assert_platform_port("linux2", self.chromium_options,
    146146                                  chromium_linux.ChromiumLinuxPort)
     147        self.assert_platform_port("linux3", self.chromium_options,
     148                                  chromium_linux.ChromiumLinuxPort)
    147149
    148150    def test_chromium_win(self):

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py

    r86429 r89031  
    5050    def baseline_search_path(self):
    5151        port_names = []
    52         if sys.platform == 'linux2':
     52        if sys.platform.startswith('linux'):
    5353            port_names.append("qt-linux")
    5454        elif sys.platform in ('win32', 'cygwin'):

  • trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

    r88848 r89031  
    151151
    152152    if not options.use_apache:
    153         options.use_apache = sys.platform in ('darwin', 'linux2')
     153        options.use_apache = sys.platform.startswith('linux') or sys.platform == 'darwin'
    154154
    155155    if not options.time_out_ms:
Note: See TracChangeset for help on using the changeset viewer.