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

expectations/gm/base-android-razr-i/expected-results.json

@@ -0,0 +1,9 @@
+{
+  "actual-results": {
+    "failed": null, 
+    "failure-ignored": null, 
+    "no-comparison": null, 
+    "succeeded": null
+  }, 
+  "expected-results": null
+}

expectations/gm/base-macmini-10_8/expected-results.json

@@ -0,0 +1,9 @@
+{
+  "actual-results": {
+    "failed": null, 
+    "failure-ignored": null, 
+    "no-comparison": null, 
+    "succeeded": null
+  }, 
+  "expected-results": null
+}

expectations/gm/base-macmini-lion-float/README

@@ -0,0 +1,11 @@
+Baseline images originally generated on our Skia_MacMiniLion_Float builtbot slave.
+
+  Model Name:    Mac mini
+  Model Identifier:	Macmini4,1
+  Processor Name:	Intel Core 2 Duo
+
+  Chipset Model:	NVIDIA GeForce 320M
+
+  OS: Mac OS 10.7.2
+
+

expectations/gm/base-macmini/README

@@ -0,0 +1,12 @@
+Baseline images originally generated on a Mac Mini
+
+  Model Name:    Mac mini
+  Model Identifier:	Macmini4,1
+  Processor Name:	Intel Core 2 Duo
+
+  Chipset Model:	NVIDIA GeForce 320M
+
+Ran these commands to generate:
+GYP_DEFINES="skia_scalar=float" make gm
+out/Debug/gm -w gm/base-macmini
+

expectations/gm/base-macpro/README

@@ -0,0 +1,21 @@
+Baseline images originally generated on a Mac Pro
+
+  Model Name:    Mac Pro
+  Model Identifier:	MacPro5,1
+  Processor Name:	6-Core Intel Xeon
+
+  Chipset Model:	ATI Radeon HD 5770
+
+Ran these commands to generate:
+GYP_DEFINES="skia_scalar=float" make gm
+out/Debug/gm -w gm/base-macpro
+
+The machine generating these baseline images had a monitor set up in landscape
+mode, such that MacOS enabled LCD subpixel text rendering.  If you generate
+your own images on a machine with a different monitor setup (e.g. portrait
+mode), you may see different pixel values at the edge of text within some
+images.  Run skdiff to look for these diffs.
+
+Note: we do NOT currently have a buildbot that validates the correctness of
+these images. They are maintained manually by Mike Reed, and may occasionally
+be out of date.

expectations/gm/base-shuttle-win7-intel-angle/README

@@ -0,0 +1,7 @@
+Baseline images generated on:
+
+Shuttle PC with Intel Core i7-2600
+with Windows 7 installed
+and using the CPU's built-in GPU (so-called "Intel HD Graphics 3000")
+
+

expectations/gm/base-shuttle-win7-intel-directwrite/README

@@ -0,0 +1,7 @@
+Baseline images generated on:
+
+Shuttle PC with Intel Core i7-2600
+with Windows 7 installed
+and using the CPU's built-in GPU (so-called "Intel HD Graphics 3000")
+
+

expectations/gm/base-shuttle-win7-intel-float/README

@@ -0,0 +1,7 @@
+Baseline images generated on:
+
+Shuttle PC with Intel Core i7-2600
+with Windows 7 installed
+and using the CPU's built-in GPU (so-called "Intel HD Graphics 3000")
+
+

expectations/gm/whitespace.txt

@@ -0,0 +1,3 @@
+
+
+

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.
     #

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()