Bug 66325 – REGRESSION(92717): WinPort needs to parse version information from port_name

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Eric Seidel (no email)]

REGRESSION(92717): WinPort needs to parse version information from port_name

Since it doesn't, and always falls back to version detection instead, this BaselineOptimizer test fails on Windows:

======================================================================
FAIL: test_complex_shadowing (webkitpy.common.checkout.baselineoptimizer_unittest.BaselineOptimizerTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/buildbot/slave/WebKit-BuildSlave/win-release-tests/build/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py", line 149, in test_complex_shadowing
    'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036'
  File "/home/buildbot/slave/WebKit-BuildSlave/win-release-tests/build/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py", line 51, in _assertOptimization
    self.assertEqual(new_results_by_directory, expected_new_results_by_directory)
AssertionError: {'LayoutTests/platform/win-7sp0': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7', 'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74', 'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364', 'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74', 'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc', 'LayoutTests/platform/mac-leopard': '7ad045ece7c030e2283c5d21d9587be22bcba56e', 'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd', 'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036'} != {'LayoutTests/platform/mac-leopard': '7ad045ece7c030e2283c5d21d9587be22bcba56e', 'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd', 'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74', 'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364', 'LayoutTests/platform/win': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7', 'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036', 'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74', 'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc'}

----------------------------------------------------------------------

To fix the test, we'll need to add version parsing, as well as a win-future rule to BaselineOptimizer:

    hypergraph['win-future'] = ['LayoutTests/platform/win-future', 'LayoutTests/platform/win', 'LayoutTests/platform/mac', 'LayoutTests']

[Eric Seidel (no email)]

This is a pretty-print result of test failure:

AssertionError:
{
    'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036'
    'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
    'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
    'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
    'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
    'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364',
    'LayoutTests/platform/mac-leopard': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
    'LayoutTests/platform/win-7sp0': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',

} !=
{
    'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036',
    'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc'
    'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
    'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
    'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
    'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364',
    'LayoutTests/platform/mac-leopard': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
    'LayoutTests/platform/win': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',
}

(I generated that manually using TextMate.  I wish there was a way to configure python unittest to pretty -print nicer. :)

[Eric Seidel (no email)]

Created attachment 104098 [details]
Patch

[WebKit Review Bot]

Comment on attachment 104098 [details]
Patch

Clearing flags on attachment: 104098

Committed r93176: <http://trac.webkit.org/changeset/93176>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.