Move gm-expected to trunk/expectations/gm , and modify scripts that use it.

Move gm-expected to trunk/expectations/gm , and modify scripts that use it.

R=borenet@google.com

Committed: https://code.google.com/p/skia/source/detail?r=10281

[epoger, 2013-07-23 17:19:25]

https://codereview.chromium.org/19697017/diff/1/buildbot/slave/skia_slave_scr...
File buildbot/slave/skia_slave_scripts/build_step.py (right):

https://codereview.chromium.org/19697017/diff/1/buildbot/slave/skia_slave_scr...
buildbot/slave/skia_slave_scripts/build_step.py:287: self._gm_expected_dir =
os.path.join('expectations', 'gm',
I haven't tested this on locally running bots, but it seems like a pretty
straightforward modification... if it's OK with you, I'll just commit the change
(after LG of course), watch things, and revert if there are any problems.

https://codereview.chromium.org/19697017/diff/1/gm-expected/base-android-gala...
File gm-expected/base-android-galaxy-nexus/expected-results.json (left):

https://codereview.chromium.org/19697017/diff/1/gm-expected/base-android-gala...
gm-expected/base-android-galaxy-nexus/expected-results.json:2: "actual-results":
{
Here's the command I ran to move the files:
svn mv gm-expected/ trunk/expectations/gm

So all of the expected-result.json files should be moved into
trunk/expectations/gm .

https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py
File trunk/tools/rebaseline.py (right):

https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py#new...
trunk/tools/rebaseline.py:330: # individual image files.  Different
expectations/gm subdirectories may move
Actually, all of the expectations are in JSON format now... but I will create a
separate CL to rip out all the code that handles image expectations, and update
the comments accordingly.

[borenet, 2013-07-23 17:23:24]

I don't see the files in trunk/expectations/gm.  Can you confirm that those are
part of this CL?

https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py
File trunk/tools/rebaseline.py (right):

https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py#new...
trunk/tools/rebaseline.py:330: # individual image files.  Different
expectations/gm subdirectories may move
On 2013/07/23 17:19:25, epoger wrote:
> Actually, all of the expectations are in JSON format now... but I will create
a
> separate CL to rip out all the code that handles image expectations, and
update
> the comments accordingly.

SGTM

[Stephen White, 2013-07-23 17:24:49]

On 2013/07/23 17:23:24, borenet wrote:
> I don't see the files in trunk/expectations/gm.  Can you confirm that those
are
> part of this CL?
> 
> https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py
> File trunk/tools/rebaseline.py (right):
> 
>
https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py#new...
> trunk/tools/rebaseline.py:330: # individual image files.  Different
> expectations/gm subdirectories may move
> On 2013/07/23 17:19:25, epoger wrote:
> > Actually, all of the expectations are in JSON format now... but I will
create
> a
> > separate CL to rip out all the code that handles image expectations, and
> update
> > the comments accordingly.
> 
> SGTM

Annoying bikeshed: why trunk/expectations/gm, and not trunk/gm-expectations? Or
trunk/gm/expectations, at worst?

[epoger, 2013-07-23 17:26:55]

On 2013/07/23 17:24:49, Stephen White wrote:
> On 2013/07/23 17:23:24, borenet wrote:
> > I don't see the files in trunk/expectations/gm.  Can you confirm that those
> are
> > part of this CL?
> > 
> > https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py
> > File trunk/tools/rebaseline.py (right):
> > 
> >
>
https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py#new...
> > trunk/tools/rebaseline.py:330: # individual image files.  Different
> > expectations/gm subdirectories may move
> > On 2013/07/23 17:19:25, epoger wrote:
> > > Actually, all of the expectations are in JSON format now... but I will
> create
> > a
> > > separate CL to rip out all the code that handles image expectations, and
> > update
> > > the comments accordingly.
> > 
> > SGTM
> 
> Annoying bikeshed: why trunk/expectations/gm, and not trunk/gm-expectations?
Or
> trunk/gm/expectations, at worst?

The decision was made (a few weeks ago, IIRC) that it made the most sense to put
all expectations (for skimage, gm, and more later) in one tree.

Of course, we may change that arrangement later.  The thing is, we need to put
the expectations SOMEWHERE under trunk asap, to unblock the transition to git.

[borenet, 2013-07-23 17:27:37]

On 2013/07/23 17:24:49, Stephen White wrote:
> On 2013/07/23 17:23:24, borenet wrote:
> > I don't see the files in trunk/expectations/gm.  Can you confirm that those
> are
> > part of this CL?
> > 
> > https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py
> > File trunk/tools/rebaseline.py (right):
> > 
> >
>
https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py#new...
> > trunk/tools/rebaseline.py:330: # individual image files.  Different
> > expectations/gm subdirectories may move
> > On 2013/07/23 17:19:25, epoger wrote:
> > > Actually, all of the expectations are in JSON format now... but I will
> create
> > a
> > > separate CL to rip out all the code that handles image expectations, and
> > update
> > > the comments accordingly.
> > 
> > SGTM
> 
> Annoying bikeshed: why trunk/expectations/gm, and not trunk/gm-expectations?
Or
> trunk/gm/expectations, at worst?

We already have expectations for skimage as well as GM, and it's entirely
possible that

[borenet, 2013-07-23 17:28:15]

Ignore my above half-comment.  It's for the reasons Elliot explained.

[epoger, 2013-07-23 17:28:32]

On 2013/07/23 17:23:24, borenet wrote:
> I don't see the files in trunk/expectations/gm.  Can you confirm that those
are
> part of this CL?

I wondered the same thing.  I think this indicates that we are OK:

epoger@wpgntat-ubiq141:~/src/skia/full-tree/svn/trunk$ svn stat | grep -v ^\?
M       tools/rebaseline.py
M       tools/svndiff.py
A  +    expectations/gm

epoger@wpgntat-ubiq141:~/src/skia/full-tree/svn/trunk$ ls -lR expectations/gm
expectations/gm:
total 72
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-galaxy-nexus
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-nexus-10
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-nexus-4
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-nexus-7
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-nexus-s
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-razr-i
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-xoom
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-linux
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-macmini
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-macmini-10_8
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-macmini-lion-float
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-macpro
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-shuttle_ubuntu12_ati5770
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-shuttle-win7-intel-angle
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-shuttle-win7-intel-directwrite
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-shuttle-win7-intel-float
drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-win
-rw-r----- 1 epoger eng    3 Jul 23 13:09 whitespace.txt

expectations/gm/base-android-galaxy-nexus:
total 88
-rw-r----- 1 epoger eng 83831 Jul 23 13:09 expected-results.json

expectations/gm/base-android-nexus-10:
total 84
-rw-r----- 1 epoger eng 81621 Jul 23 13:09 expected-results.json

expectations/gm/base-android-nexus-4:
total 32
-rw-r----- 1 epoger eng 32578 Jul 23 13:09 expected-results.json

expectations/gm/base-android-nexus-7:
total 88
-rw-r----- 1 epoger eng 84586 Jul 23 13:09 expected-results.json

expectations/gm/base-android-nexus-s:
total 88
-rw-r----- 1 epoger eng 83824 Jul 23 13:09 expected-results.json

expectations/gm/base-android-razr-i:
total 4
-rw-r----- 1 epoger eng 159 Jul 23 13:09 expected-results.json

expectations/gm/base-android-xoom:
total 88
-rw-r----- 1 epoger eng 83073 Jul 23 13:09 expected-results.json

expectations/gm/base-linux:
total 56
-rw-r----- 1 epoger eng 49782 Jul 23 13:09 expected-results.json

expectations/gm/base-macmini:
total 144
-rw-r----- 1 epoger eng 135897 Jul 23 13:09 expected-results.json
-rw-r----- 1 epoger eng    288 Jul 23 13:09 README

expectations/gm/base-macmini-10_8:
total 4
-rw-r----- 1 epoger eng 159 Jul 23 13:09 expected-results.json

expectations/gm/base-macmini-lion-float:
total 152
-rw-r----- 1 epoger eng 147400 Jul 23 13:09 expected-results.json
-rw-r----- 1 epoger eng    237 Jul 23 13:09 README

expectations/gm/base-macpro:
total 172
-rw-r----- 1 epoger eng 167367 Jul 23 13:09 expected-results.json
-rw-r----- 1 epoger eng    804 Jul 23 13:09 README

expectations/gm/base-shuttle_ubuntu12_ati5770:
total 88
-rw-r----- 1 epoger eng 83598 Jul 23 13:09 expected-results.json

expectations/gm/base-shuttle-win7-intel-angle:
total 36
-rw-r----- 1 epoger eng 30191 Jul 23 13:09 expected-results.json
-rw-r----- 1 epoger eng   163 Jul 23 13:09 README

expectations/gm/base-shuttle-win7-intel-directwrite:
total 92
-rw-r----- 1 epoger eng 83060 Jul 23 13:09 expected-results.json
-rw-r----- 1 epoger eng   163 Jul 23 13:09 README

expectations/gm/base-shuttle-win7-intel-float:
total 92
-rw-r----- 1 epoger eng 83410 Jul 23 13:09 expected-results.json
-rw-r----- 1 epoger eng   163 Jul 23 13:09 README

expectations/gm/base-win:
total 48
-rw-r----- 1 epoger eng 47698 Jul 23 13:09 expected-results.json

[borenet, 2013-07-23 17:32:42]

On 2013/07/23 17:28:32, epoger wrote:
> On 2013/07/23 17:23:24, borenet wrote:
> > I don't see the files in trunk/expectations/gm.  Can you confirm that those
> are
> > part of this CL?
> 
> I wondered the same thing.  I think this indicates that we are OK:
> 
> epoger@wpgntat-ubiq141:~/src/skia/full-tree/svn/trunk$ svn stat | grep -v ^\?
> M       tools/rebaseline.py
> M       tools/svndiff.py
> A  +    expectations/gm
> 
> epoger@wpgntat-ubiq141:~/src/skia/full-tree/svn/trunk$ ls -lR expectations/gm
> expectations/gm:
> total 72
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-galaxy-nexus
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-nexus-10
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-nexus-4
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-nexus-7
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-nexus-s
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-razr-i
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-android-xoom
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-linux
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-macmini
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-macmini-10_8
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-macmini-lion-float
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-macpro
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-shuttle_ubuntu12_ati5770
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-shuttle-win7-intel-angle
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-shuttle-win7-intel-directwrite
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-shuttle-win7-intel-float
> drwxr-x--- 3 epoger eng 4096 Jul 23 13:09 base-win
> -rw-r----- 1 epoger eng    3 Jul 23 13:09 whitespace.txt
> 
> expectations/gm/base-android-galaxy-nexus:
> total 88
> -rw-r----- 1 epoger eng 83831 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-android-nexus-10:
> total 84
> -rw-r----- 1 epoger eng 81621 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-android-nexus-4:
> total 32
> -rw-r----- 1 epoger eng 32578 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-android-nexus-7:
> total 88
> -rw-r----- 1 epoger eng 84586 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-android-nexus-s:
> total 88
> -rw-r----- 1 epoger eng 83824 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-android-razr-i:
> total 4
> -rw-r----- 1 epoger eng 159 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-android-xoom:
> total 88
> -rw-r----- 1 epoger eng 83073 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-linux:
> total 56
> -rw-r----- 1 epoger eng 49782 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-macmini:
> total 144
> -rw-r----- 1 epoger eng 135897 Jul 23 13:09 expected-results.json
> -rw-r----- 1 epoger eng    288 Jul 23 13:09 README
> 
> expectations/gm/base-macmini-10_8:
> total 4
> -rw-r----- 1 epoger eng 159 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-macmini-lion-float:
> total 152
> -rw-r----- 1 epoger eng 147400 Jul 23 13:09 expected-results.json
> -rw-r----- 1 epoger eng    237 Jul 23 13:09 README
> 
> expectations/gm/base-macpro:
> total 172
> -rw-r----- 1 epoger eng 167367 Jul 23 13:09 expected-results.json
> -rw-r----- 1 epoger eng    804 Jul 23 13:09 README
> 
> expectations/gm/base-shuttle_ubuntu12_ati5770:
> total 88
> -rw-r----- 1 epoger eng 83598 Jul 23 13:09 expected-results.json
> 
> expectations/gm/base-shuttle-win7-intel-angle:
> total 36
> -rw-r----- 1 epoger eng 30191 Jul 23 13:09 expected-results.json
> -rw-r----- 1 epoger eng   163 Jul 23 13:09 README
> 
> expectations/gm/base-shuttle-win7-intel-directwrite:
> total 92
> -rw-r----- 1 epoger eng 83060 Jul 23 13:09 expected-results.json
> -rw-r----- 1 epoger eng   163 Jul 23 13:09 README
> 
> expectations/gm/base-shuttle-win7-intel-float:
> total 92
> -rw-r----- 1 epoger eng 83410 Jul 23 13:09 expected-results.json
> -rw-r----- 1 epoger eng   163 Jul 23 13:09 README
> 
> expectations/gm/base-win:
> total 48
> -rw-r----- 1 epoger eng 47698 Jul 23 13:09 expected-results.json

LGTM with fingers crossed

[epoger, 2013-07-23 17:35:46]

Committed patchset #1 manually as r10281 (presubmit successful).

[Stephen White, 2013-07-23 17:48:33]

On 2013/07/23 17:26:55, epoger wrote:
> On 2013/07/23 17:24:49, Stephen White wrote:
> > On 2013/07/23 17:23:24, borenet wrote:
> > > I don't see the files in trunk/expectations/gm.  Can you confirm that
those
> > are
> > > part of this CL?
> > > 
> > > https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py
> > > File trunk/tools/rebaseline.py (right):
> > > 
> > >
> >
>
https://codereview.chromium.org/19697017/diff/1/trunk/tools/rebaseline.py#new...
> > > trunk/tools/rebaseline.py:330: # individual image files.  Different
> > > expectations/gm subdirectories may move
> > > On 2013/07/23 17:19:25, epoger wrote:
> > > > Actually, all of the expectations are in JSON format now... but I will
> > create
> > > a
> > > > separate CL to rip out all the code that handles image expectations, and
> > > update
> > > > the comments accordingly.
> > > 
> > > SGTM
> > 
> > Annoying bikeshed: why trunk/expectations/gm, and not trunk/gm-expectations?
> Or
> > trunk/gm/expectations, at worst?
> 
> The decision was made (a few weeks ago, IIRC) that it made the most sense to
put
> all expectations (for skimage, gm, and more later) in one tree.
> 
> Of course, we may change that arrangement later.  The thing is, we need to put
> the expectations SOMEWHERE under trunk asap, to unblock the transition to git.

OK, thanks for the explanation.

[epoger, 2013-07-23 18:53:09]

This broke the Update step on all Test builders.

I reverted it as r10285, and have a new version of the CL out for Eric's review
as https://codereview.chromium.org/19668009/ .