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

trunk/tools/verify_images_for_gm_results.py

 #!/usr/bin/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.
 
 
 """ Look through skia-autogen, searching for all checksums which should have
 corresponding files in Google Storage, and verify that those files exist. """
 
@@ skipping 29 matching lines @@
 def FindURLSInJSON(json_file, gs_urls):
   """ Extract Google Storage URLs from a JSON file in svn, adding them to the
   gs_urls dictionary.
 
   json_file: string; URL of the JSON file.
   gs_urls: dict; stores Google Storage URLs as keys and lists of the JSON files
       which reference them.
 
   Example gs_urls:
   { 'gs://chromium-skia-gm/gm/sometest/12345.png': [
-      'http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/base-macmini/actual-results.json',
-      'http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-10_8/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/base-macmini-10_8/actual-results.json',
+      'http://skia-autogen.googlecode.com/svn/gm-actual/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/actual-results.json',
+      'http://skia-autogen.googlecode.com/svn/gm-actual/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/actual-results.json',
     ]
   }
   """
   output = subprocess.check_output(['svn', 'cat', json_file])
   json_content = json.loads(output)
   for dict_type in ['actual-results']:
     for result_type in json_content[dict_type]:
       if json_content[dict_type][result_type]:
         for result in json_content[dict_type][result_type].keys():
           hash_type, hash_value = json_content[dict_type][result_type][result]
@@ skipping 42 matching lines @@
 
 def FindURLs(url):
   """ Find Google Storage URLs inside of JSON files in the given repository.
   Returns a dictionary whose keys are Google Storage URLs and values are lists
   of the JSON files which reference them.
 
   url: string; URL of the repository to explore.
 
   Example output:
   { 'gs://chromium-skia-gm/gm/sometest/12345.png': [
-      'http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/base-macmini/actual-results.json',
-      'http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-10_8/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/base-macmini-10_8/actual-results.json',
+      'http://skia-autogen.googlecode.com/svn/gm-actual/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/actual-results.json',
+      'http://skia-autogen.googlecode.com/svn/gm-actual/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/actual-results.json',
     ]
   }
   """
   gs_urls = {}
   for json_file in FindJSONFiles(url):
     print 'Looking for checksums in %s' % json_file
     FindURLSInJSON(json_file, gs_urls)
   return gs_urls
 
 
 def VerifyURL(url):
   """ Verify that the given URL exists.
 
   url: string; the Google Storage URL of the image file in question.
   """
   proc = subprocess.Popen(['gsutil', 'ls', url], stdout=subprocess.PIPE,
                           stderr=subprocess.STDOUT)
   if proc.wait() != 0:
     return False
   return True
 
 
 def VerifyURLs(urls):
   """ Verify that each of the given URLs exists. Return a list of which URLs do
   not exist.
-  
+
   urls: dictionary; URLs of the image files in question.
   """
   print 'Verifying that images exist for URLs...'
   missing = []
   for url in urls.iterkeys():
     if not VerifyURL(url):
       print 'Missing: %s, referenced by: \n  %s' % (url, '\n  '.join(urls[url]))
       missing.append(url)
   return missing
 
 
 def Main():
   urls = FindURLs(AUTOGEN_URL)
   missing = VerifyURLs(urls)
   if missing:
     print 'Found %d Missing files.' % len(missing)
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(Main())