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

buildbot/slave/skia_slave_scripts/upload_gm_results.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Upload actual GM results to the skia-autogen SVN repository to aid in
 rebaselining. """
 
 from build_step import BuildStep
 from common import chromium_utils
@@ skipping 64 matching lines @@
 
     # Call MergeIntoSvn to actually perform the work.
     # TODO: We should do something a bit more sophisticated, to address
     # https://code.google.com/p/skia/issues/detail?id=720 ('UploadGMs step
     # should be skipped when re-running old revisions of the buildbot')
     merge_options = Options()
     # pylint: disable=W0201
     merge_options.commit_message = 'UploadGMResults of r%s on %s' % (
         self._got_revision, self._args['builder_name'])
     # pylint: disable=W0201
-    merge_options.dest_svn_url = '%s/%s/%s/%s' % (
-        gm_actual_svn_baseurl, self._args['gm_image_subdir'],
-        self._args['builder_name'], self._args['gm_image_subdir'])
+    merge_options.dest_svn_url = '%s/%s' % (
+        gm_actual_svn_baseurl, self._args['builder_name'])
     # pylint: disable=W0201
     merge_options.merge_dir_path = os.path.join(gm_merge_basedir,
-                                                self._args['gm_image_subdir'])
+                                                self._args['builder_name'])
     # Clear out the merge_dir, in case it has old imagefiles in it from the
     # bad old days when we were still uploading actual images to skia-autogen.
     # This resolves https://code.google.com/p/skia/issues/detail?id=1362 ('some
     # buildbots are still uploading image files to skia-autogen after r9709')
     #
     # We wouldn't want to do this for a mergedir like that used for the
     # Doxygen docs, since that dir holds so many files.. but this mergedir
     # only holds the actual-results.json file now.  So the overhead of
     # downloading that file from the repo every time isn't a big deal.
     chromium_utils.RemoveDirectory(merge_options.merge_dir_path)
@@ skipping 16 matching lines @@
     print 'Uploading %d JSON files to skia-autogen: %s...' % (
         len(files_to_upload), files_to_upload)
     for filename in files_to_upload:
       src_filepath = os.path.join(src_dir, filename)
       shutil.copy(src_filepath, tempdir)
     self._SVNUploadDir(src_dir=tempdir)
     shutil.rmtree(tempdir)
 
   def _Run(self):
     gm_output_dir = os.path.join(os.pardir, os.pardir, 'gm', 'actual',
-                                 self._args['gm_image_subdir'])
+                                 self._args['builder_name'])
     self._GSUploadAllImages(src_dir=gm_output_dir)
     self._SVNUploadJsonFiles(src_dir=gm_output_dir)
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(UploadGMResults))