Remove base-* directories from gm expected/actual paths; just use platform names

Remove base-* directories from gm expected/actual paths; just use platform names

[epoger, 2013-08-13 15:53:14]

Patchset 1 moves the expectations from their old subdirectory names to the
platform names.  I created this patchset using the following commands:

svn cp base-android-galaxy-nexus Test-Android-GalaxyNexus-SGX540-Arm7-Debug
svn cp base-android-galaxy-nexus Test-Android-GalaxyNexus-SGX540-Arm7-Release
svn cp base-android-nexus-10 Test-Android-Nexus10-MaliT604-Arm7-Debug
svn cp base-android-nexus-10 Test-Android-Nexus10-MaliT604-Arm7-Release
svn cp base-android-nexus-4 Test-Android-Nexus4-Adreno320-Arm7-Debug
svn cp base-android-nexus-4 Test-Android-Nexus4-Adreno320-Arm7-Release
svn cp base-android-nexus-7 Test-Android-Nexus7-Tegra3-Arm7-Debug
svn cp base-android-nexus-7 Test-Android-Nexus7-Tegra3-Arm7-Release
svn cp base-android-nexus-s Test-Android-NexusS-SGX540-Arm7-Debug
svn cp base-android-nexus-s Test-Android-NexusS-SGX540-Arm7-Release
svn cp base-android-razr-i Test-Android-RazrI-SGX540-x86-Debug
svn cp base-android-razr-i Test-Android-RazrI-SGX540-x86-Release
svn cp base-android-xoom Test-Android-Xoom-Tegra2-Arm7-Debug
svn cp base-android-xoom Test-Android-Xoom-Tegra2-Arm7-Release
svn cp base-macmini-10_8 Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug
svn cp base-macmini-10_8 Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release
svn cp base-macmini-10_8 Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug
svn cp base-macmini-10_8 Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release
svn cp base-macmini-lion-float Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug
svn cp base-macmini-lion-float
Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release
svn cp base-macmini-lion-float Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug
svn cp base-macmini-lion-float Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release
svn cp base-macmini Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug
svn cp base-macmini Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release
svn cp base-macmini Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug
svn cp base-macmini Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release
svn cp base-shuttle_ubuntu12_ati5770 Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug
svn cp base-shuttle_ubuntu12_ati5770
Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release
svn cp base-shuttle_ubuntu12_ati5770 Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug
svn cp base-shuttle_ubuntu12_ati5770 Test-Ubuntu12-ShuttleA-ATI5770-x86-Release
svn cp base-shuttle_ubuntu12_ati5770 Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug
svn cp base-shuttle-win7-intel-angle Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE
svn cp base-shuttle-win7-intel-angle Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE
svn cp base-shuttle-win7-intel-directwrite
Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite
svn cp base-shuttle-win7-intel-directwrite
Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite
svn cp base-shuttle-win7-intel-float Test-Win7-ShuttleA-HD2000-x86_64-Debug
svn cp base-shuttle-win7-intel-float Test-Win7-ShuttleA-HD2000-x86_64-Release
svn cp base-shuttle-win7-intel-float Test-Win7-ShuttleA-HD2000-x86-Debug
svn cp base-shuttle-win7-intel-float Test-Win7-ShuttleA-HD2000-x86-Release
svn rm base-android-galaxy-nexus
svn rm base-android-nexus-10
svn rm base-android-nexus-4
svn rm base-android-nexus-7
svn rm base-android-nexus-s
svn rm base-android-razr-i
svn rm base-android-xoom
svn rm base-macmini
svn rm base-macmini-10_8
svn rm base-macmini-lion-float
svn rm base-shuttle_ubuntu12_ati5770
svn rm base-shuttle-win7-intel-angle
svn rm base-shuttle-win7-intel-directwrite
svn rm base-shuttle-win7-intel-float

[epoger, 2013-08-13 15:55:22]

On 2013/08/13 15:53:14, epoger wrote:
> Patchset 1 moves the expectations from their old subdirectory names to the
> platform names. 

Note that the codereview tool only shows the deletes, not the adds... but the
adds are really there, as shown in gcl change:

---All lines above this line become the description.
---Repository Root: /usr/local/google/home/epoger/src/skia/full-tree/svn
---Paths in this changelist (subdirs):

D      trunk/expectations/gm/base-macmini
D      trunk/expectations/gm/base-macmini/expected-results.json
D      trunk/expectations/gm/base-macmini/README
D      trunk/expectations/gm/base-macmini-lion-float
D      trunk/expectations/gm/base-macmini-lion-float/README
D      trunk/expectations/gm/base-macmini-lion-float/expected-results.json
A  +   trunk/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug
A  +   trunk/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release
A  +   trunk/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release
A  +   trunk/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release
A  +   trunk/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug
A  +   trunk/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release
A  +   trunk/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug
A  +   trunk/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug
A  +   trunk/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug
A  +   trunk/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug
A  +   trunk/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug
D      trunk/expectations/gm/base-android-xoom
D      trunk/expectations/gm/base-android-xoom/expected-results.json
D      trunk/expectations/gm/base-android-galaxy-nexus
D      trunk/expectations/gm/base-android-galaxy-nexus/expected-results.json
D      trunk/expectations/gm/base-shuttle-win7-intel-directwrite
D     
trunk/expectations/gm/base-shuttle-win7-intel-directwrite/expected-results.json
D      trunk/expectations/gm/base-shuttle-win7-intel-directwrite/README
A  +   trunk/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release
A  +   trunk/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug
D      trunk/expectations/gm/base-shuttle_ubuntu12_ati5770
D      trunk/expectations/gm/base-shuttle_ubuntu12_ati5770/expected-results.json
D      trunk/expectations/gm/base-android-nexus-s
D      trunk/expectations/gm/base-android-nexus-s/expected-results.json
D      trunk/expectations/gm/base-android-nexus-4
D      trunk/expectations/gm/base-android-nexus-4/expected-results.json
D      trunk/expectations/gm/base-android-razr-i
D      trunk/expectations/gm/base-android-razr-i/expected-results.json
D      trunk/expectations/gm/base-macmini-10_8
D      trunk/expectations/gm/base-macmini-10_8/expected-results.json
A  +   trunk/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release
D      trunk/expectations/gm/base-android-nexus-7
D      trunk/expectations/gm/base-android-nexus-7/expected-results.json
A  +   trunk/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release
A  +   trunk/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release
A  +   trunk/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release
D      trunk/expectations/gm/base-shuttle-win7-intel-float
D      trunk/expectations/gm/base-shuttle-win7-intel-float/expected-results.json
D      trunk/expectations/gm/base-shuttle-win7-intel-float/README
A  +   trunk/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release
A  +   trunk/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug
A  +   trunk/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug
A  +   trunk/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug
A  +   trunk/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug
A  +   trunk/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release
A  +   trunk/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release
A  +   trunk/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release
D      trunk/expectations/gm/base-android-nexus-10
D      trunk/expectations/gm/base-android-nexus-10/expected-results.json
A  +   trunk/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite
A  +   trunk/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug
A  +   trunk/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE
A  +   trunk/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug
A  +   trunk/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug
A  +   trunk/expectations/gm/Test-Android-RazrI-SGX540-x86-Release
A  +   trunk/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug
A  +   trunk/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release
A  +   trunk/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite
A  +   trunk/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE
D      trunk/expectations/gm/base-shuttle-win7-intel-angle
D      trunk/expectations/gm/base-shuttle-win7-intel-angle/README
D      trunk/expectations/gm/base-shuttle-win7-intel-angle/expected-results.json
A  +   trunk/expectations/gm/Test-Android-RazrI-SGX540-x86-Debug
A  +   trunk/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release
A  +   trunk/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug
A  +   trunk/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release

[epoger, 2013-08-13 15:56:33]

Not ready for review yet, but I wanted to give you a front-row seat while I
stage this change.

If you have any questions/concerns along the way, please let me know.

[epoger, 2013-08-13 16:49:47]

Still working... I will let you know when it's ready for review.

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

https://codereview.chromium.org/23001003/diff/6001/trunk/tools/rebaseline.py#...
trunk/tools/rebaseline.py:39: # Full list of builder names (under
Patchset 2 updates rebaseline.py to use the new regime, and updates the
accompanying self-tests.

[epoger, 2013-08-13 17:19:32]

https://codereview.chromium.org/23001003/diff/16001/trunk/tools/verify_images...
File trunk/tools/verify_images_for_gm_results.py (right):

https://codereview.chromium.org/23001003/diff/16001/trunk/tools/verify_images...
trunk/tools/verify_images_for_gm_results.py:50:
'http://skia-autogen.googlecode.com/svn/gm-actual/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/actual-results.json',
In this exciting installment (patchset 3), I updated comments within
verify_images_for_gm_results.py to reflect the new arrangement.

[epoger, 2013-08-13 18:16:53]

https://codereview.chromium.org/23001003/diff/20001/buildbot/master/master_bu...
File buildbot/master/master_builders_cfg.py (left):

https://codereview.chromium.org/23001003/diff/20001/buildbot/master/master_bu...
buildbot/master/master_builders_cfg.py:130: #    OS          Compiler  Config   
 Arch     Extra Config    GYP_DEFS   WERR             Role    OS          Model 
       GPU            Extra Config   GM Subdir
In patchset 4, I removed the "GM Subdir" parameter from builder setup on the
buildbot master.

https://codereview.chromium.org/23001003/diff/20001/buildbot/master/skia_mast...
File buildbot/master/skia_master_scripts/skia_build_step.py (left):

https://codereview.chromium.org/23001003/diff/20001/buildbot/master/skia_mast...
buildbot/master/skia_master_scripts/skia_build_step.py:94: def
_CheckRebaselineChanges(changes, gm_image_subdir):
As far as I can tell, this function isn't called anymore.

https://codereview.chromium.org/23001003/diff/20001/buildbot/tools/tests/fact...
File
buildbot/tools/tests/factory_configuration/expected/Build-Mac10.6-GCC-x86-Debug
(left):

https://codereview.chromium.org/23001003/diff/20001/buildbot/tools/tests/fact...
buildbot/tools/tests/factory_configuration/expected/Build-Mac10.6-GCC-x86-Debug:23:
'--gm_image_subdir',
The factory_configuration self-test output has changed for all builders... they
no longer specify a --gm_image_subdir argument.

[epoger, 2013-08-13 20:03:13]

<sigh> "gcl upload" has started getting finicky for this CL, probably because of
its size (all the config self-test expectations for the buildbot master,
probably).

Also, I probably shouldn't change the directory names used for storing SKP
results under gs://chromium-skia-gm/playback/gm-actual , which I will have to if
I get rid of gm_image_subdir entirely.
 
For both of those reasons, I am going to redo this CL in
https://codereview.chromium.org/23082002/ , and leave out the master-side
changes for now.