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

buildbot/slave/skia_slave_scripts/compare_and_upload_webpage_gms.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Compares the GM images from archived webpages to the baselines.
 
 This module can be run from the command-line like this:
 
 cd buildbot/third_party/chromium_buildbot/slave/\
 Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/build/trunk
 
 PYTHONPATH=../../../../site_config:\
 ../../../../scripts \
 python ../../../../../../slave/skia_slave_scripts/\
 compare_and_upload_webpage_gms.py \
 --configuration "Debug" --target_platform "" --revision 0 \
 --autogen_svn_baseurl "" --make_flags "" --test_args "" --gm_args "" \
 --bench_args "" --num_cores 8 --perf_output_basedir "" \
 --builder_name Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release \
---got_revision 0 --gm_image_subdir base-shuttle_ubuntu12_ati5770 \
+--got_revision 0 \
 --is_try False --do_upload_results True --dest_gsbase gs://rmistry
 
 """
 
 import os
 import posixpath
 import shutil
 import sys
 import tempfile
 
@@ skipping 12 matching lines @@
 GM_COMPARISON_LINES_TO_EXTRACT_IMAGES = [
   'have identical dimensions but some differing pixels',
   'have differing dimensions',
   'not found in baseDir and found in comparisonDir',
 ]
 
 GM_COMPARISON_LINES_TO_DELETE_IMAGES = [
   'found in baseDir and not found in comparisonDir',
 ]
 
-IMAGES_FOR_UPLOAD_CHUNKS = [
-  'base-macmini',
-  'base-macmini-lion-float',
-  'base-macmini-10_8',
-  'base-shuttle_ubuntu12_ati5770',
-]
-
 
 class CompareAndUploadWebpageGMs(BuildStep):
 
   def __init__(
       self,
       timeout=build_step.DEFAULT_TIMEOUT * SKP_TIMEOUT_MULTIPLIER,
       no_output_timeout=(
           build_step.DEFAULT_NO_OUTPUT_TIMEOUT * SKP_TIMEOUT_MULTIPLIER),
       **kwargs):
     """Constructs a RenderWebpagePictures BuildStep instance.
 
     timeout: maximum time allowed for this BuildStep. The default value here is
              increased because there could be a lot of skps' whose images have
              to be copied over to Google Storage.
     no_output_timeout: maximum time allowed for this BuildStep to run without
         any output.
     """
     build_step.BuildStep.__init__(self, timeout=timeout,
                                   no_output_timeout=no_output_timeout,
                                   **kwargs)
 
     self._dest_gsbase = (self._args.get('dest_gsbase') or
                          sync_bucket_subdir.DEFAULT_PERFDATA_GS_BASE)
 
-    self._upload_chunks = (
-        True if self._gm_image_subdir in IMAGES_FOR_UPLOAD_CHUNKS
-             else False)
+    self._upload_chunks = True
 
     # Check if gm-expected exists on Google Storage.
     self._gm_expected_exists_on_storage = gs_utils.DoesStorageObjectExist(
         posixpath.join(self._dest_gsbase,
                        self._storage_playback_dirs.PlaybackGmExpectedDir(),
                        gs_utils.TIMESTAMP_COMPLETED_FILENAME))
     # Check if gm-actual exists on Google Storage.
     self._gm_actual_exists_on_storage = gs_utils.DoesStorageObjectExist(
         posixpath.join(self._dest_gsbase,
                        self._storage_playback_dirs.PlaybackGmActualDir(),
@@ skipping 216 matching lines @@
     f = open(comparison_file, 'r')
     try:
       value = f.read()
       return value.strip()
     finally:
       f.close()
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(CompareAndUploadWebpageGMs))