Bug 69590 – There should be a way to disable optimizer in webkit-patch rebaseline-expectations

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Ryosuke Niwa]

There must be a way to disable expectation optimizer in webkit-patch rebaseline-expectations.

I often rebaseline then use pretty-diff to see test diffs because plain diff and wdiff hurt my eyes, but diffs are all messed when expected results are optimized.
Also, it erroneously puts render tree dumps in cross-platform directory.

[Ryosuke Niwa]

I'd say that this is a requirement before we can remove rebaseline-chromium-webkit-tests.

[Adam Barth]

Why is it wrong to put render tree dumps in the cross-platform directory when they're the same on most (all?) platforms?

[Adam Barth]

I think the real issue is that there isn't a good way of viewing the effects of changing expectations, which is something we should fix.

[Ryosuke Niwa]

(In reply to comment #2)
> Why is it wrong to put render tree dumps in the cross-platform directory when they're the same on most (all?) platforms?

Because that'll make missing results to failures on some ports.
(In reply to comment #3)

> I think the real issue is that there isn't a good way of viewing the effects of changing expectations, which is something we should fix.

Right but I don't want to learn how to use new tools. pretty-diff works as is, and I'd like to keep using that.

[Adam Barth]

Right, pretty-diff should help you understand how a patch will change results on various platforms.

[Ryosuke Niwa]

Optimizing expected results is great but that can be done after I've verified the correctness of rebaselines.

[Dirk Pranke]

Created attachment 130251 [details]
Patch

[Ryosuke Niwa]

Comment on attachment 130251 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=130251&action=review

> Tools/Scripts/webkitpy/tool/commands/rebaseline.py:206
> +        if options.optimize:

I think it's better to do an early return here.

[Adam Barth]

Comment on attachment 130251 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=130251&action=review

> Tools/Scripts/webkitpy/tool/commands/rebaseline.py:160
> +            optparse.make_option('--optimize', action='store_true', default=True,
> +                help=('Optimize/de-dup the expectations after rebaselining (default).')),
> +            optparse.make_option('--no-optimize', dest='optimize', action='store_false',
> +                help=('Do not optimize/de-dup the expectations after rebaselining '
> +                      'You can use "webkit-patch optimize-baselines" to optimize separately.')),

For webkit-patch, we usually just provide a flag for the non-default setting.

[Dirk Pranke]

*** Bug 72860 has been marked as a duplicate of this bug. ***

[Dirk Pranke]

Committed r109831: <http://trac.webkit.org/changeset/109831>