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

trunk/tools/rebaseline.py

Index: trunk/tools/rebaseline.py
===================================================================
--- trunk/tools/rebaseline.py	(revision 10285)
+++ trunk/tools/rebaseline.py	(working copy)
@@ -9,8 +9,6 @@
 
 '''
 Rebaselines the given GM tests, on all bots and all configurations.
-Must be run from the gm-expected directory.  If run from a git or SVN
-checkout, the files will be added to the staging area for commit.
 
 TODO(epoger): Fix indentation in this file (2-space indents, not 4-space).
 '''
@@ -42,8 +40,8 @@
     sys.path.append(GM_DIRECTORY)
 import gm_json
 
-# Mapping of gm-expectations subdir (under
-# https://skia.googlecode.com/svn/gm-expected/ )
+# Mapping of expectations/gm subdir (under
+# https://skia.googlecode.com/svn/trunk/expectations/gm/ )
 # to builder name (see list at http://108.170.217.252:10117/builders )
 SUBDIR_MAPPING = {
    'base-shuttle-win7-intel-float':
@@ -205,7 +203,7 @@
         return results_to_return
 
     # Rebaseline all tests/types we specified in the constructor,
-    # within this gm-expectations subdir.
+    # within this expectations/gm subdir.
     #
     # params:
     #  subdir : e.g. 'base-shuttle-win7-intel-float'
@@ -296,7 +294,7 @@
                     help='root of expectations directory to update-- should ' +
                     'contain one or more base-* subdirectories. Defaults to ' +
                     '%(default)s',
-                    default='.')
+                    default=os.path.join('expectations', 'gm'))
 parser.add_argument('--keep-going-on-failure', action='store_true',
                     help='instead of halting at the first error encountered, ' +
                     'keep going and rebaseline as many tests as possible, ' +
@@ -329,7 +327,7 @@
 
     # We instantiate different Rebaseliner objects depending
     # on whether we are rebaselining an expected-results.json file, or
-    # individual image files.  Different gm-expected subdirectories may move
+    # individual image files.  Different expectations/gm subdirectories may move
     # from individual image files to JSON-format expectations at different
     # times, so we need to make this determination per subdirectory.
     #