| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py
|
| index 6a9c3253654a9aeaac67507842ef859ea7ccf2c6..755f42e391e3b5c667e180caeac90fa0d448ac5e 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py
|
| @@ -25,7 +25,6 @@
|
| # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| -
|
| """Factory method to retrieve the appropriate port implementation."""
|
|
|
| import fnmatch
|
| @@ -38,30 +37,42 @@ from webkitpy.layout_tests.port import builders
|
|
|
| def platform_options(use_globs=False):
|
| return [
|
| - optparse.make_option('--android', action='store_const', dest='platform',
|
| - const=('android*' if use_globs else 'android'),
|
| - help=('Alias for --platform=android*' if use_globs else 'Alias for --platform=android')),
|
| + optparse.make_option('--android',
|
| + action='store_const',
|
| + dest='platform',
|
| + const=('android*' if use_globs else 'android'),
|
| + help=('Alias for --platform=android*' if use_globs else 'Alias for --platform=android')),
|
|
|
| # FIXME: Update run_webkit_tests.sh, any other callers to no longer pass --chromium, then remove this flag.
|
| - optparse.make_option('--chromium', action='store_const', dest='platform',
|
| - const=('chromium*' if use_globs else 'chromium'),
|
| - help=('Alias for --platform=chromium*' if use_globs else 'Alias for --platform=chromium')),
|
| -
|
| - optparse.make_option('--platform', action='store',
|
| - help=('Glob-style list of platform/ports to use (e.g., "mac*")' if use_globs else 'Platform to use (e.g., "mac-lion")')),
|
| - ]
|
| + optparse.make_option('--chromium',
|
| + action='store_const',
|
| + dest='platform',
|
| + const=('chromium*' if use_globs else 'chromium'),
|
| + help=('Alias for --platform=chromium*' if use_globs else 'Alias for --platform=chromium')),
|
| + optparse.make_option('--platform',
|
| + action='store',
|
| + help=('Glob-style list of platform/ports to use (e.g., "mac*")' if use_globs else
|
| + 'Platform to use (e.g., "mac-lion")')),
|
| + ]
|
|
|
|
|
| def configuration_options():
|
| return [
|
| - optparse.make_option('--debug', action='store_const', const='Debug', dest="configuration",
|
| - help='Set the configuration to Debug'),
|
| - optparse.make_option("-t", "--target", dest="target",
|
| + optparse.make_option('--debug',
|
| + action='store_const',
|
| + const='Debug',
|
| + dest="configuration",
|
| + help='Set the configuration to Debug'),
|
| + optparse.make_option("-t",
|
| + "--target",
|
| + dest="target",
|
| help="specify the target configuration to use (Debug/Release)"),
|
| - optparse.make_option('--release', action='store_const', const='Release', dest="configuration",
|
| - help='Set the configuration to Release'),
|
| - ]
|
| -
|
| + optparse.make_option('--release',
|
| + action='store_const',
|
| + const='Release',
|
| + dest="configuration",
|
| + help='Set the configuration to Release'),
|
| + ]
|
|
|
|
|
| def _builder_options(builder_name):
|
| @@ -125,14 +136,12 @@ def _read_configuration_from_gn(fs, options):
|
|
|
|
|
| class PortFactory(object):
|
| - PORT_CLASSES = (
|
| - 'android.AndroidPort',
|
| - 'linux.LinuxPort',
|
| - 'mac.MacPort',
|
| - 'win.WinPort',
|
| - 'mock_drt.MockDRTPort',
|
| - 'test.TestPort',
|
| - )
|
| + PORT_CLASSES = ('android.AndroidPort',
|
| + 'linux.LinuxPort',
|
| + 'mac.MacPort',
|
| + 'win.WinPort',
|
| + 'mock_drt.MockDRTPort',
|
| + 'test.TestPort', )
|
|
|
| def __init__(self, host):
|
| self._host = host
|
|
|