Changeset 230601 in webkit


Ignore:
Timestamp:
Apr 12, 2018 3:03:34 PM (6 years ago)
Author:
Jonathan Bedard
Message:

Fix --build-directory flag for run-webkit-tests
https://bugs.webkit.org/show_bug.cgi?id=184545
<rdar://problem/39385080>

Rubber-stamped by Aakash Jain.

The --build-directory path does not work with iOS-Simulator.

  • Scripts/webkitpy/port/base.py:

(Port._build_path): Use the port configuration to calculate the root directory.

  • Scripts/webkitpy/port/base_unittest.py:

(PortTest.test_build_path): Test build directories for embedded configurations.

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r230593 r230601  
     12018-04-12  Jonathan Bedard  <jbedard@apple.com>
     2
     3        Fix --build-directory flag for run-webkit-tests
     4        https://bugs.webkit.org/show_bug.cgi?id=184545
     5        <rdar://problem/39385080>
     6
     7        Rubber-stamped by Aakash Jain.
     8
     9        The --build-directory path does not work with iOS-Simulator.
     10
     11        * Scripts/webkitpy/port/base.py:
     12        (Port._build_path): Use the port configuration to calculate the root directory.
     13        * Scripts/webkitpy/port/base_unittest.py:
     14        (PortTest.test_build_path): Test build directories for embedded configurations.
     15
    1162018-04-12  Ross Kirsling  <ross.kirsling@sony.com>
    217
  • trunk/Tools/Scripts/webkitpy/port/base.py

    r229541 r230601  
    12841284        root_directory = self.get_option('_cached_root') or self.get_option('root')
    12851285        if not root_directory:
     1286            root_directory = self._config.build_directory(self.get_option('configuration'))
    12861287            build_directory = self.get_option('build_directory')
    12871288            if build_directory:
    1288                 root_directory = self._filesystem.join(build_directory, self.get_option('configuration'))
    1289             else:
    1290                 root_directory = self._config.build_directory(self.get_option('configuration'))
     1289                root_directory = self._filesystem.join(build_directory, root_directory.split('/')[-1])
     1290
    12911291            # We take advantage of the behavior that self._options is passed by reference to worker
    12921292            # subprocesses to use it as data store to cache the computed root directory path. This
  • trunk/Tools/Scripts/webkitpy/port/base_unittest.py

    r216030 r230601  
    366366
    367367    def test_build_path(self):
    368         port = self.make_port(options=optparse.Values({'build_directory': '/my-build-directory/'}))
    369         if port.get_option('configuration') == 'Debug':
    370             self.assertEqual(port._build_path(), '/my-build-directory/Debug')
    371         else:
    372             self.assertEqual(port._build_path(), '/my-build-directory/Release')
     368        port = self.make_port(
     369            executive=MockExecutive2(output='/default-build-path/Debug'),
     370            options=optparse.Values({'build_directory': '/my-build-directory/'}),
     371        )
     372        self.assertEqual(port._build_path(), '/my-build-directory/Debug')
     373
     374        port = self.make_port(
     375            executive=MockExecutive2(output='/default-build-path/Debug-embedded-port'),
     376            options=optparse.Values({'build_directory': '/my-build-directory/'}),
     377        )
     378        self.assertEqual(port._build_path(), '/my-build-directory/Debug-embedded-port')
    373379
    374380    def test_is_w3c_resource_file(self):
Note: See TracChangeset for help on using the changeset viewer.