use additional_expectations as a command parameter

use additional_expectations as a command parameter
and --additional-expectations as a wrapper parameter to match
run-webkit-tests.

Once this lands, I'll delete the support for --additional-expectations-files

R=jochen@chromium.org, cmp@chromium.org


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=189919

[Dirk Pranke, 2013-03-19 01:06:25]

Jochen, can you review this?

Chase, for an OWNERS approval ...

Note that layout_test_wrapper already maps --additional-expectations-files to
--additional-expectations, so this change should be a no-op.

[cmp, 2013-03-19 19:05:00]

+xusydoc to have a look for OWNERS approval

[Mike Stip (use stip instead), 2013-03-19 19:36:36]

lgtm for OWNERS

[jochen (gone - plz use gerrit), 2013-03-19 20:19:32]

lgtm, but please address the comment before landing

https://codereview.chromium.org/12927002/diff/1/masters/master.chromium.webki...
File masters/master.chromium.webkit/master_android_contentshell_latest_cfg.py
(right):

https://codereview.chromium.org/12927002/diff/1/masters/master.chromium.webki...
masters/master.chromium.webkit/master_android_contentshell_latest_cfg.py:46:
'additional_expectations': [
this will break, since android uses the annotation script approach.

You should probably update the annotation script so it understands both
properties first.

[Dirk Pranke, 2013-03-20 01:19:57]

On 2013/03/19 20:19:32, jochen wrote:
> lgtm, but please address the comment before landing
> 
>
https://codereview.chromium.org/12927002/diff/1/masters/master.chromium.webki...
> File masters/master.chromium.webkit/master_android_contentshell_latest_cfg.py
> (right):
> 
>
https://codereview.chromium.org/12927002/diff/1/masters/master.chromium.webki...
> masters/master.chromium.webkit/master_android_contentshell_latest_cfg.py:46:
> 'additional_expectations': [
> this will break, since android uses the annotation script approach.
> 
> You should probably update the annotation script so it understands both
> properties first.

Good catch. Patch for the annotator posted in
https://codereview.chromium.org/12580009/ .

[commit-bot: I haz the power, 2013-03-22 21:50:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dpranke@chromium.org/12927002/1

[commit-bot: I haz the power, 2013-03-22 21:55:20]

Change committed as 189919