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

Left dummy content in the old gm-expected dir to keep Update step happy,
to avoid the breakages caused by r10281.

R=borenet@google.com

Review URL: https://codereview.chromium.org/19668009

git-svn-id: http://skia.googlecode.com/svn/trunk@10288 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 7 insertions, 8 deletions

diff --git a/tools/rebaseline.py b/tools/rebaseline.py
index 692cb1abc1..2c9898ff80 100755
--- a/tools/rebaseline.py
+++ b/tools/rebaseline.py
@@ -9,8 +9,6 @@ found in the LICENSE file.
 
 '''
 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 @@ if GM_DIRECTORY not in sys.path:
     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 @@ class JsonRebaseliner(object):
         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 @@ parser.add_argument('--expectations-root',
                     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 @@ for subdir in subdirs:
 
     # 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.
     #
diff --git a/tools/svndiff.py b/tools/svndiff.py
index bb064b7d58..9e51eee22c 100755
--- a/tools/svndiff.py
+++ b/tools/svndiff.py
@@ -311,7 +311,8 @@ if __name__ == '__main__':
                       'will search for it in typical directories near this '
                       'script')
     parser.add_option(OPTION_SOURCE_DIR,
-                      action='store', type='string', default='.',
+                      action='store', type='string',
+                      default=os.path.join('expectations', 'gm'),
                       help='root directory within which to compare all ' +
                       'files; defaults to "%default"')
     (options, args) = parser.parse_args()