rebaseline.py: try to download images from Google Storage before skia-autogen

This will allow us to complete Step 1 of https://goto.google.com/ChecksumTransitionDetail R=scroggo@google.com Review URL: https://codereview.chromium.org/16311011 git-svn-id: http://skia.googlecode.com/svn/trunk@9534 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-12 17:44:14 +00:00 · 2013-06-12 17:44:14 +00:00 · e78d20798d
commit e78d20798d
parent b8b619a158
8 changed files with 312 additions and 80 deletions
--- a/tools/rebaseline.py
+++ b/tools/rebaseline.py
@ -16,6 +16,7 @@ checkout, the files will be added to the staging area for commit.
 # System-level imports
 import argparse
 import os
+import re
 import subprocess
 import sys
 import urllib2
@ -105,6 +106,9 @@ class Rebaseliner(object):
        self._json_filename = json_filename
        self._dry_run = dry_run
        self._add_new = add_new
+        self._googlestorage_gm_actuals_root = (
+            'http://chromium-skia-gm.commondatastorage.googleapis.com/gm')
+        self._testname_pattern = re.compile('(\S+)_(\S+).png')
        self._is_svn_checkout = (
            os.path.exists('.svn') or
            os.path.exists(os.path.join(os.pardir, '.svn')))
@ -123,6 +127,42 @@ class Rebaseliner(object):
            raise CommandFailedException('error running command: ' +
                                         ' '.join(cmd))

+    # Download a single actual result from GoogleStorage, returning True if it
+    # succeeded.
+    def _DownloadFromGoogleStorage(self, infilename, outfilename, all_results):
+        test_name = self._testname_pattern.match(infilename).group(1)
+        if not test_name:
+            print '# unable to find test_name for infilename %s' % infilename
+            return False
+        try:
+            hash_type, hash_value = all_results[infilename]
+        except KeyError:
+            print ('# unable to find filename %s in all_results dict' %
+                   infilename)
+            return False
+        url = '%s/%s/%s/%s.png' % (self._googlestorage_gm_actuals_root,
+                                   hash_type, test_name, hash_value)
+        try:
+            self._DownloadFile(source_url=url, dest_filename=outfilename)
+            return True
+        except CommandFailedException:
+            print '# Couldn\'t fetch gs_url %s' % url
+            return False
+
+    # Download a single actual result from skia-autogen, returning True if it
+    # succeeded.
+    def _DownloadFromAutogen(self, infilename, outfilename,
+                             expectations_subdir, builder_name):
+        url = ('http://skia-autogen.googlecode.com/svn/gm-actual/' +
+               expectations_subdir + '/' + builder_name + '/' +
+               expectations_subdir + '/' + infilename)
+        try:
+            self._DownloadFile(source_url=url, dest_filename=outfilename)
+            return True
+        except CommandFailedException:
+            print '# Couldn\'t fetch autogen_url %s' % url
+            return False
+
    # Download a single file, raising a CommandFailedException if it fails.
    def _DownloadFile(self, source_url, dest_filename):
        # Download into a temporary file and then rename it afterwards,
@ -149,6 +189,48 @@ class Rebaseliner(object):
        else:
            return urllib2.urlopen(url).read()

+    # Returns a dictionary of actual results from actual-results.json file.
+    #
+    # The dictionary returned has this format:
+    # {
+    #  u'imageblur_565.png': [u'bitmap-64bitMD5', 3359963596899141322],
+    #  u'imageblur_8888.png': [u'bitmap-64bitMD5', 4217923806027861152],
+    #  u'shadertext3_8888.png': [u'bitmap-64bitMD5', 3713708307125704716]
+    # }
+    #
+    # If the JSON actual result summary file cannot be loaded, the behavior
+    # depends on self._missing_json_is_fatal:
+    # - if true: execution will halt with an exception
+    # - if false: we will log an error message but return an empty dictionary
+    #
+    # params:
+    #  json_url: URL pointing to a JSON actual result summary file
+    #  sections: a list of section names to include in the results, e.g.
+    #            [gm_json.JSONKEY_ACTUALRESULTS_FAILED,
+    #             gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON] ;
+    #            if None, then include ALL sections.
+    def _GetActualResults(self, json_url, sections=None):
+        try:
+            json_contents = self._GetContentsOfUrl(json_url)
+        except (urllib2.HTTPError, IOError):
+            message = 'unable to load JSON summary URL %s' % json_url
+            if self._missing_json_is_fatal:
+                raise ValueError(message)
+            else:
+                print '# %s' % message
+                return {}
+
+        json_dict = gm_json.LoadFromString(json_contents)
+        results_to_return = {}
+        actual_results = json_dict[gm_json.JSONKEY_ACTUALRESULTS]
+        if not sections:
+            sections = actual_results.keys()
+        for section in sections:
+            section_results = actual_results[section]
+            if section_results:
+                results_to_return.update(section_results)
+        return results_to_return
+
    # Returns a list of files that require rebaselining.
    #
    # Note that this returns a list of FILES, like this:
@ -156,12 +238,6 @@ class Rebaseliner(object):
    # rather than a list of TESTS, like this:
    #  ['imageblur', 'xfermodes']
    #
-    # If the JSON actual result summary file cannot be loaded, the behavior
-    # depends on self._missing_json_is_fatal:
-    # - if true: execution will halt with an exception
-    # - if false: we will log an error message but return an empty list so we
-    #   go on to the next platform
-    #
    # params:
    #  json_url: URL pointing to a JSON actual result summary file
    #  add_new: if True, then return files listed in any of these sections:
@ -176,28 +252,13 @@ class Rebaseliner(object):
            print '#'
        print ('# Getting files to rebaseline from JSON summary URL %s ...'
               % json_url)
-        try:
-            json_contents = self._GetContentsOfUrl(json_url)
-        except urllib2.HTTPError:
-            message = 'unable to load JSON summary URL %s' % json_url
-            if self._missing_json_is_fatal:
-                raise ValueError(message)
-            else:
-                print '# %s' % message
-                return []
-
-        json_dict = gm_json.LoadFromString(json_contents)
-        actual_results = json_dict[gm_json.JSONKEY_ACTUALRESULTS]
        sections = [gm_json.JSONKEY_ACTUALRESULTS_FAILED]
        if add_new:
            sections.append(gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON)
-
-        files_to_rebaseline = []
-        for section in sections:
-            section_results = actual_results[section]
-            if section_results:
-                files_to_rebaseline.extend(section_results.keys())
-
+        results_to_rebaseline = self._GetActualResults(json_url=json_url,
+                                                       sections=sections)
+        files_to_rebaseline = results_to_rebaseline.keys()
+        files_to_rebaseline.sort()
        print '# ... found files_to_rebaseline %s' % files_to_rebaseline
        if self._dry_run:
            print '#'
@ -205,31 +266,33 @@ class Rebaseliner(object):

    # Rebaseline a single file.
    def _RebaselineOneFile(self, expectations_subdir, builder_name,
-                           infilename, outfilename):
+                           infilename, outfilename, all_results):
        if self._dry_run:
            print ''
        print '# ' + infilename
-        url = ('http://skia-autogen.googlecode.com/svn/gm-actual/' +
-               expectations_subdir + '/' + builder_name + '/' +
-               expectations_subdir + '/' + infilename)

-        # Try to download this file, but if that fails, keep going...
+        # First try to download this result image from Google Storage.
+        # If that fails, try skia-autogen.
+        # If that fails too, just go on to the next file.
        #
        # This not treated as a fatal failure because not all
        # platforms generate all configs (e.g., Android does not
        # generate PDF).
        #
-        # We could tweak the list of configs within this tool to
-        # reflect which combinations the bots actually generate, and
-        # then fail if any of those expected combinations are
-        # missing... but then this tool would become useless every
-        # time someone tweaked the configs on the bots without
-        # updating this script.
-        try:
-            self._DownloadFile(source_url=url, dest_filename=outfilename)
-        except CommandFailedException:
-            print '# Couldn\'t fetch ' + url
-            return
+        # TODO(epoger): Once we are downloading only files that the
+        # actual-results.json file told us to, this should become a
+        # fatal error.  (If the actual-results.json file told us that
+        # the test failed with XXX results, we should be able to download
+        # those results every time.)
+        if not self._DownloadFromGoogleStorage(infilename=infilename,
+                                               outfilename=outfilename,
+                                               all_results=all_results):
+            if not self._DownloadFromAutogen(infilename=infilename,
+                                             outfilename=outfilename,
+                                             expectations_subdir=expectations_subdir,
+                                             builder_name=builder_name):
+                print '# Couldn\'t fetch infilename ' + infilename
+                return

        # Add this file to version control (if appropriate).
        if self._add_new:
@ -249,7 +312,9 @@ class Rebaseliner(object):
    #  expectations_subdir
    #  builder_name
    #  test: a single test to rebaseline
-    def _RebaselineOneTest(self, expectations_subdir, builder_name, test):
+    #  all_results: a dictionary of all actual results
+    def _RebaselineOneTest(self, expectations_subdir, builder_name, test,
+                           all_results):
        if self._configs:
            configs = self._configs
        else:
@ -267,7 +332,8 @@ class Rebaseliner(object):
            self._RebaselineOneFile(expectations_subdir=expectations_subdir,
                                    builder_name=builder_name,
                                    infilename=infilename,
-                                    outfilename=outfilename)
+                                    outfilename=outfilename,
+                                    all_results=all_results)

    # Rebaseline all platforms/tests/types we specified in the constructor.
    def RebaselineAll(self):
@ -277,15 +343,17 @@ class Rebaseliner(object):
                                 'should be one of %s') % (
                                     subdir, SUBDIR_MAPPING.keys()))
            builder_name = SUBDIR_MAPPING[subdir]
+            json_url = '/'.join([self._json_base_url,
+                                 subdir, builder_name, subdir,
+                                 self._json_filename])
+            all_results = self._GetActualResults(json_url=json_url)
+
            if self._tests:
                for test in self._tests:
                    self._RebaselineOneTest(expectations_subdir=subdir,
                                            builder_name=builder_name,
-                                            test=test)
+                                            test=test, all_results=all_results)
            else:  # get the raw list of files that need rebaselining from JSON
-                json_url = '/'.join([self._json_base_url,
-                                     subdir, builder_name, subdir,
-                                     self._json_filename])
                filenames = self._GetFilesToRebaseline(json_url=json_url,
                                                       add_new=self._add_new)
                for filename in filenames:
@ -293,7 +361,8 @@ class Rebaseliner(object):
                    self._RebaselineOneFile(expectations_subdir=subdir,
                                            builder_name=builder_name,
                                            infilename=filename,
-                                            outfilename=outfilename)
+                                            outfilename=outfilename,
+                                            all_results=all_results)

 # main...

--- a/tools/tests/rebaseline/output/all/output-expected/command_line
+++ b/tools/tests/rebaseline/output/all/output-expected/command_line
@ -1 +1 @@
-python tools/rebaseline.py --dry-run --tests test1 test2
+python tools/rebaseline.py --dry-run --json-base-url file:nonexistent-path --tests test1 test2
--- a/tools/tests/rebaseline/output/all/output-expected/stdout
+++ b/tools/tests/rebaseline/output/all/output-expected/stdout
@ -1,620 +1,775 @@
+# unable to load JSON summary URL file:nonexistent-path/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/actual-results.json

 # base-android-galaxy-nexus:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_565.png --output base-android-galaxy-nexus/.temp-test1_565.png
 mv base-android-galaxy-nexus/.temp-test1_565.png base-android-galaxy-nexus/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_8888.png --output base-android-galaxy-nexus/.temp-test1_8888.png
 mv base-android-galaxy-nexus/.temp-test1_8888.png base-android-galaxy-nexus/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_gpu.png --output base-android-galaxy-nexus/.temp-test1_gpu.png
 mv base-android-galaxy-nexus/.temp-test1_gpu.png base-android-galaxy-nexus/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_pdf.png --output base-android-galaxy-nexus/.temp-test1_pdf.png
 mv base-android-galaxy-nexus/.temp-test1_pdf.png base-android-galaxy-nexus/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_mesa.png --output base-android-galaxy-nexus/.temp-test1_mesa.png
 mv base-android-galaxy-nexus/.temp-test1_mesa.png base-android-galaxy-nexus/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_msaa16.png --output base-android-galaxy-nexus/.temp-test1_msaa16.png
 mv base-android-galaxy-nexus/.temp-test1_msaa16.png base-android-galaxy-nexus/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_msaa4.png --output base-android-galaxy-nexus/.temp-test1_msaa4.png
 mv base-android-galaxy-nexus/.temp-test1_msaa4.png base-android-galaxy-nexus/test1_msaa4.png

 # base-android-galaxy-nexus:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_565.png --output base-android-galaxy-nexus/.temp-test2_565.png
 mv base-android-galaxy-nexus/.temp-test2_565.png base-android-galaxy-nexus/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_8888.png --output base-android-galaxy-nexus/.temp-test2_8888.png
 mv base-android-galaxy-nexus/.temp-test2_8888.png base-android-galaxy-nexus/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_gpu.png --output base-android-galaxy-nexus/.temp-test2_gpu.png
 mv base-android-galaxy-nexus/.temp-test2_gpu.png base-android-galaxy-nexus/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_pdf.png --output base-android-galaxy-nexus/.temp-test2_pdf.png
 mv base-android-galaxy-nexus/.temp-test2_pdf.png base-android-galaxy-nexus/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_mesa.png --output base-android-galaxy-nexus/.temp-test2_mesa.png
 mv base-android-galaxy-nexus/.temp-test2_mesa.png base-android-galaxy-nexus/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_msaa16.png --output base-android-galaxy-nexus/.temp-test2_msaa16.png
 mv base-android-galaxy-nexus/.temp-test2_msaa16.png base-android-galaxy-nexus/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_msaa4.png --output base-android-galaxy-nexus/.temp-test2_msaa4.png
 mv base-android-galaxy-nexus/.temp-test2_msaa4.png base-android-galaxy-nexus/test2_msaa4.png
+# unable to load JSON summary URL file:nonexistent-path/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/actual-results.json

 # base-android-nexus-10:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_565.png --output base-android-nexus-10/.temp-test1_565.png
 mv base-android-nexus-10/.temp-test1_565.png base-android-nexus-10/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_8888.png --output base-android-nexus-10/.temp-test1_8888.png
 mv base-android-nexus-10/.temp-test1_8888.png base-android-nexus-10/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_gpu.png --output base-android-nexus-10/.temp-test1_gpu.png
 mv base-android-nexus-10/.temp-test1_gpu.png base-android-nexus-10/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_pdf.png --output base-android-nexus-10/.temp-test1_pdf.png
 mv base-android-nexus-10/.temp-test1_pdf.png base-android-nexus-10/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_mesa.png --output base-android-nexus-10/.temp-test1_mesa.png
 mv base-android-nexus-10/.temp-test1_mesa.png base-android-nexus-10/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_msaa16.png --output base-android-nexus-10/.temp-test1_msaa16.png
 mv base-android-nexus-10/.temp-test1_msaa16.png base-android-nexus-10/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_msaa4.png --output base-android-nexus-10/.temp-test1_msaa4.png
 mv base-android-nexus-10/.temp-test1_msaa4.png base-android-nexus-10/test1_msaa4.png

 # base-android-nexus-10:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_565.png --output base-android-nexus-10/.temp-test2_565.png
 mv base-android-nexus-10/.temp-test2_565.png base-android-nexus-10/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_8888.png --output base-android-nexus-10/.temp-test2_8888.png
 mv base-android-nexus-10/.temp-test2_8888.png base-android-nexus-10/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_gpu.png --output base-android-nexus-10/.temp-test2_gpu.png
 mv base-android-nexus-10/.temp-test2_gpu.png base-android-nexus-10/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_pdf.png --output base-android-nexus-10/.temp-test2_pdf.png
 mv base-android-nexus-10/.temp-test2_pdf.png base-android-nexus-10/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_mesa.png --output base-android-nexus-10/.temp-test2_mesa.png
 mv base-android-nexus-10/.temp-test2_mesa.png base-android-nexus-10/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_msaa16.png --output base-android-nexus-10/.temp-test2_msaa16.png
 mv base-android-nexus-10/.temp-test2_msaa16.png base-android-nexus-10/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_msaa4.png --output base-android-nexus-10/.temp-test2_msaa4.png
 mv base-android-nexus-10/.temp-test2_msaa4.png base-android-nexus-10/test2_msaa4.png
+# unable to load JSON summary URL file:nonexistent-path/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/actual-results.json

 # base-android-nexus-7:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_565.png --output base-android-nexus-7/.temp-test1_565.png
 mv base-android-nexus-7/.temp-test1_565.png base-android-nexus-7/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_8888.png --output base-android-nexus-7/.temp-test1_8888.png
 mv base-android-nexus-7/.temp-test1_8888.png base-android-nexus-7/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_gpu.png --output base-android-nexus-7/.temp-test1_gpu.png
 mv base-android-nexus-7/.temp-test1_gpu.png base-android-nexus-7/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_pdf.png --output base-android-nexus-7/.temp-test1_pdf.png
 mv base-android-nexus-7/.temp-test1_pdf.png base-android-nexus-7/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_mesa.png --output base-android-nexus-7/.temp-test1_mesa.png
 mv base-android-nexus-7/.temp-test1_mesa.png base-android-nexus-7/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_msaa16.png --output base-android-nexus-7/.temp-test1_msaa16.png
 mv base-android-nexus-7/.temp-test1_msaa16.png base-android-nexus-7/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_msaa4.png --output base-android-nexus-7/.temp-test1_msaa4.png
 mv base-android-nexus-7/.temp-test1_msaa4.png base-android-nexus-7/test1_msaa4.png

 # base-android-nexus-7:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_565.png --output base-android-nexus-7/.temp-test2_565.png
 mv base-android-nexus-7/.temp-test2_565.png base-android-nexus-7/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_8888.png --output base-android-nexus-7/.temp-test2_8888.png
 mv base-android-nexus-7/.temp-test2_8888.png base-android-nexus-7/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_gpu.png --output base-android-nexus-7/.temp-test2_gpu.png
 mv base-android-nexus-7/.temp-test2_gpu.png base-android-nexus-7/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_pdf.png --output base-android-nexus-7/.temp-test2_pdf.png
 mv base-android-nexus-7/.temp-test2_pdf.png base-android-nexus-7/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_mesa.png --output base-android-nexus-7/.temp-test2_mesa.png
 mv base-android-nexus-7/.temp-test2_mesa.png base-android-nexus-7/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_msaa16.png --output base-android-nexus-7/.temp-test2_msaa16.png
 mv base-android-nexus-7/.temp-test2_msaa16.png base-android-nexus-7/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_msaa4.png --output base-android-nexus-7/.temp-test2_msaa4.png
 mv base-android-nexus-7/.temp-test2_msaa4.png base-android-nexus-7/test2_msaa4.png
+# unable to load JSON summary URL file:nonexistent-path/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/actual-results.json

 # base-android-nexus-s:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_565.png --output base-android-nexus-s/.temp-test1_565.png
 mv base-android-nexus-s/.temp-test1_565.png base-android-nexus-s/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_8888.png --output base-android-nexus-s/.temp-test1_8888.png
 mv base-android-nexus-s/.temp-test1_8888.png base-android-nexus-s/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_gpu.png --output base-android-nexus-s/.temp-test1_gpu.png
 mv base-android-nexus-s/.temp-test1_gpu.png base-android-nexus-s/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_pdf.png --output base-android-nexus-s/.temp-test1_pdf.png
 mv base-android-nexus-s/.temp-test1_pdf.png base-android-nexus-s/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_mesa.png --output base-android-nexus-s/.temp-test1_mesa.png
 mv base-android-nexus-s/.temp-test1_mesa.png base-android-nexus-s/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_msaa16.png --output base-android-nexus-s/.temp-test1_msaa16.png
 mv base-android-nexus-s/.temp-test1_msaa16.png base-android-nexus-s/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_msaa4.png --output base-android-nexus-s/.temp-test1_msaa4.png
 mv base-android-nexus-s/.temp-test1_msaa4.png base-android-nexus-s/test1_msaa4.png

 # base-android-nexus-s:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_565.png --output base-android-nexus-s/.temp-test2_565.png
 mv base-android-nexus-s/.temp-test2_565.png base-android-nexus-s/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_8888.png --output base-android-nexus-s/.temp-test2_8888.png
 mv base-android-nexus-s/.temp-test2_8888.png base-android-nexus-s/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_gpu.png --output base-android-nexus-s/.temp-test2_gpu.png
 mv base-android-nexus-s/.temp-test2_gpu.png base-android-nexus-s/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_pdf.png --output base-android-nexus-s/.temp-test2_pdf.png
 mv base-android-nexus-s/.temp-test2_pdf.png base-android-nexus-s/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_mesa.png --output base-android-nexus-s/.temp-test2_mesa.png
 mv base-android-nexus-s/.temp-test2_mesa.png base-android-nexus-s/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_msaa16.png --output base-android-nexus-s/.temp-test2_msaa16.png
 mv base-android-nexus-s/.temp-test2_msaa16.png base-android-nexus-s/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_msaa4.png --output base-android-nexus-s/.temp-test2_msaa4.png
 mv base-android-nexus-s/.temp-test2_msaa4.png base-android-nexus-s/test2_msaa4.png
+# unable to load JSON summary URL file:nonexistent-path/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/actual-results.json

 # base-android-xoom:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_565.png --output base-android-xoom/.temp-test1_565.png
 mv base-android-xoom/.temp-test1_565.png base-android-xoom/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_8888.png --output base-android-xoom/.temp-test1_8888.png
 mv base-android-xoom/.temp-test1_8888.png base-android-xoom/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_gpu.png --output base-android-xoom/.temp-test1_gpu.png
 mv base-android-xoom/.temp-test1_gpu.png base-android-xoom/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_pdf.png --output base-android-xoom/.temp-test1_pdf.png
 mv base-android-xoom/.temp-test1_pdf.png base-android-xoom/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_mesa.png --output base-android-xoom/.temp-test1_mesa.png
 mv base-android-xoom/.temp-test1_mesa.png base-android-xoom/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_msaa16.png --output base-android-xoom/.temp-test1_msaa16.png
 mv base-android-xoom/.temp-test1_msaa16.png base-android-xoom/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_msaa4.png --output base-android-xoom/.temp-test1_msaa4.png
 mv base-android-xoom/.temp-test1_msaa4.png base-android-xoom/test1_msaa4.png

 # base-android-xoom:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_565.png --output base-android-xoom/.temp-test2_565.png
 mv base-android-xoom/.temp-test2_565.png base-android-xoom/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_8888.png --output base-android-xoom/.temp-test2_8888.png
 mv base-android-xoom/.temp-test2_8888.png base-android-xoom/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_gpu.png --output base-android-xoom/.temp-test2_gpu.png
 mv base-android-xoom/.temp-test2_gpu.png base-android-xoom/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_pdf.png --output base-android-xoom/.temp-test2_pdf.png
 mv base-android-xoom/.temp-test2_pdf.png base-android-xoom/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_mesa.png --output base-android-xoom/.temp-test2_mesa.png
 mv base-android-xoom/.temp-test2_mesa.png base-android-xoom/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_msaa16.png --output base-android-xoom/.temp-test2_msaa16.png
 mv base-android-xoom/.temp-test2_msaa16.png base-android-xoom/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_msaa4.png --output base-android-xoom/.temp-test2_msaa4.png
 mv base-android-xoom/.temp-test2_msaa4.png base-android-xoom/test2_msaa4.png
+# unable to load JSON summary URL file:nonexistent-path/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/actual-results.json

 # base-macmini:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_565.png --output base-macmini/.temp-test1_565.png
 mv base-macmini/.temp-test1_565.png base-macmini/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_8888.png --output base-macmini/.temp-test1_8888.png
 mv base-macmini/.temp-test1_8888.png base-macmini/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_gpu.png --output base-macmini/.temp-test1_gpu.png
 mv base-macmini/.temp-test1_gpu.png base-macmini/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_pdf.png --output base-macmini/.temp-test1_pdf.png
 mv base-macmini/.temp-test1_pdf.png base-macmini/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_mesa.png --output base-macmini/.temp-test1_mesa.png
 mv base-macmini/.temp-test1_mesa.png base-macmini/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_msaa16.png --output base-macmini/.temp-test1_msaa16.png
 mv base-macmini/.temp-test1_msaa16.png base-macmini/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_msaa4.png --output base-macmini/.temp-test1_msaa4.png
 mv base-macmini/.temp-test1_msaa4.png base-macmini/test1_msaa4.png

 # base-macmini:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_565.png --output base-macmini/.temp-test2_565.png
 mv base-macmini/.temp-test2_565.png base-macmini/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_8888.png --output base-macmini/.temp-test2_8888.png
 mv base-macmini/.temp-test2_8888.png base-macmini/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_gpu.png --output base-macmini/.temp-test2_gpu.png
 mv base-macmini/.temp-test2_gpu.png base-macmini/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_pdf.png --output base-macmini/.temp-test2_pdf.png
 mv base-macmini/.temp-test2_pdf.png base-macmini/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_mesa.png --output base-macmini/.temp-test2_mesa.png
 mv base-macmini/.temp-test2_mesa.png base-macmini/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_msaa16.png --output base-macmini/.temp-test2_msaa16.png
 mv base-macmini/.temp-test2_msaa16.png base-macmini/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_msaa4.png --output base-macmini/.temp-test2_msaa4.png
 mv base-macmini/.temp-test2_msaa4.png base-macmini/test2_msaa4.png
+# unable to load JSON summary URL file:nonexistent-path/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/actual-results.json

 # base-macmini-lion-float:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_565.png --output base-macmini-lion-float/.temp-test1_565.png
 mv base-macmini-lion-float/.temp-test1_565.png base-macmini-lion-float/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_8888.png --output base-macmini-lion-float/.temp-test1_8888.png
 mv base-macmini-lion-float/.temp-test1_8888.png base-macmini-lion-float/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_gpu.png --output base-macmini-lion-float/.temp-test1_gpu.png
 mv base-macmini-lion-float/.temp-test1_gpu.png base-macmini-lion-float/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_pdf.png --output base-macmini-lion-float/.temp-test1_pdf.png
 mv base-macmini-lion-float/.temp-test1_pdf.png base-macmini-lion-float/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_mesa.png --output base-macmini-lion-float/.temp-test1_mesa.png
 mv base-macmini-lion-float/.temp-test1_mesa.png base-macmini-lion-float/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_msaa16.png --output base-macmini-lion-float/.temp-test1_msaa16.png
 mv base-macmini-lion-float/.temp-test1_msaa16.png base-macmini-lion-float/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_msaa4.png --output base-macmini-lion-float/.temp-test1_msaa4.png
 mv base-macmini-lion-float/.temp-test1_msaa4.png base-macmini-lion-float/test1_msaa4.png

 # base-macmini-lion-float:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_565.png --output base-macmini-lion-float/.temp-test2_565.png
 mv base-macmini-lion-float/.temp-test2_565.png base-macmini-lion-float/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_8888.png --output base-macmini-lion-float/.temp-test2_8888.png
 mv base-macmini-lion-float/.temp-test2_8888.png base-macmini-lion-float/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_gpu.png --output base-macmini-lion-float/.temp-test2_gpu.png
 mv base-macmini-lion-float/.temp-test2_gpu.png base-macmini-lion-float/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_pdf.png --output base-macmini-lion-float/.temp-test2_pdf.png
 mv base-macmini-lion-float/.temp-test2_pdf.png base-macmini-lion-float/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_mesa.png --output base-macmini-lion-float/.temp-test2_mesa.png
 mv base-macmini-lion-float/.temp-test2_mesa.png base-macmini-lion-float/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_msaa16.png --output base-macmini-lion-float/.temp-test2_msaa16.png
 mv base-macmini-lion-float/.temp-test2_msaa16.png base-macmini-lion-float/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_msaa4.png --output base-macmini-lion-float/.temp-test2_msaa4.png
 mv base-macmini-lion-float/.temp-test2_msaa4.png base-macmini-lion-float/test2_msaa4.png
+# unable to load JSON summary URL file:nonexistent-path/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/actual-results.json

 # base-shuttle-win7-intel-angle:

 # test1_angle.png
+# unable to find filename test1_angle.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/test1_angle.png --output base-shuttle-win7-intel-angle/.temp-test1_angle.png
 mv base-shuttle-win7-intel-angle/.temp-test1_angle.png base-shuttle-win7-intel-angle/test1_angle.png

 # test1_anglemsaa16.png
+# unable to find filename test1_anglemsaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/test1_anglemsaa16.png --output base-shuttle-win7-intel-angle/.temp-test1_anglemsaa16.png
 mv base-shuttle-win7-intel-angle/.temp-test1_anglemsaa16.png base-shuttle-win7-intel-angle/test1_anglemsaa16.png

 # base-shuttle-win7-intel-angle:

 # test2_angle.png
+# unable to find filename test2_angle.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/test2_angle.png --output base-shuttle-win7-intel-angle/.temp-test2_angle.png
 mv base-shuttle-win7-intel-angle/.temp-test2_angle.png base-shuttle-win7-intel-angle/test2_angle.png

 # test2_anglemsaa16.png
+# unable to find filename test2_anglemsaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/test2_anglemsaa16.png --output base-shuttle-win7-intel-angle/.temp-test2_anglemsaa16.png
 mv base-shuttle-win7-intel-angle/.temp-test2_anglemsaa16.png base-shuttle-win7-intel-angle/test2_anglemsaa16.png
+# unable to load JSON summary URL file:nonexistent-path/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/actual-results.json

 # base-shuttle-win7-intel-directwrite:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_565.png --output base-shuttle-win7-intel-directwrite/.temp-test1_565.png
 mv base-shuttle-win7-intel-directwrite/.temp-test1_565.png base-shuttle-win7-intel-directwrite/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_8888.png --output base-shuttle-win7-intel-directwrite/.temp-test1_8888.png
 mv base-shuttle-win7-intel-directwrite/.temp-test1_8888.png base-shuttle-win7-intel-directwrite/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_gpu.png --output base-shuttle-win7-intel-directwrite/.temp-test1_gpu.png
 mv base-shuttle-win7-intel-directwrite/.temp-test1_gpu.png base-shuttle-win7-intel-directwrite/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_pdf.png --output base-shuttle-win7-intel-directwrite/.temp-test1_pdf.png
 mv base-shuttle-win7-intel-directwrite/.temp-test1_pdf.png base-shuttle-win7-intel-directwrite/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_mesa.png --output base-shuttle-win7-intel-directwrite/.temp-test1_mesa.png
 mv base-shuttle-win7-intel-directwrite/.temp-test1_mesa.png base-shuttle-win7-intel-directwrite/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_msaa16.png --output base-shuttle-win7-intel-directwrite/.temp-test1_msaa16.png
 mv base-shuttle-win7-intel-directwrite/.temp-test1_msaa16.png base-shuttle-win7-intel-directwrite/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_msaa4.png --output base-shuttle-win7-intel-directwrite/.temp-test1_msaa4.png
 mv base-shuttle-win7-intel-directwrite/.temp-test1_msaa4.png base-shuttle-win7-intel-directwrite/test1_msaa4.png

 # base-shuttle-win7-intel-directwrite:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_565.png --output base-shuttle-win7-intel-directwrite/.temp-test2_565.png
 mv base-shuttle-win7-intel-directwrite/.temp-test2_565.png base-shuttle-win7-intel-directwrite/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_8888.png --output base-shuttle-win7-intel-directwrite/.temp-test2_8888.png
 mv base-shuttle-win7-intel-directwrite/.temp-test2_8888.png base-shuttle-win7-intel-directwrite/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_gpu.png --output base-shuttle-win7-intel-directwrite/.temp-test2_gpu.png
 mv base-shuttle-win7-intel-directwrite/.temp-test2_gpu.png base-shuttle-win7-intel-directwrite/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_pdf.png --output base-shuttle-win7-intel-directwrite/.temp-test2_pdf.png
 mv base-shuttle-win7-intel-directwrite/.temp-test2_pdf.png base-shuttle-win7-intel-directwrite/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_mesa.png --output base-shuttle-win7-intel-directwrite/.temp-test2_mesa.png
 mv base-shuttle-win7-intel-directwrite/.temp-test2_mesa.png base-shuttle-win7-intel-directwrite/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_msaa16.png --output base-shuttle-win7-intel-directwrite/.temp-test2_msaa16.png
 mv base-shuttle-win7-intel-directwrite/.temp-test2_msaa16.png base-shuttle-win7-intel-directwrite/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_msaa4.png --output base-shuttle-win7-intel-directwrite/.temp-test2_msaa4.png
 mv base-shuttle-win7-intel-directwrite/.temp-test2_msaa4.png base-shuttle-win7-intel-directwrite/test2_msaa4.png
+# unable to load JSON summary URL file:nonexistent-path/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json

 # base-shuttle-win7-intel-float:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_565.png --output base-shuttle-win7-intel-float/.temp-test1_565.png
 mv base-shuttle-win7-intel-float/.temp-test1_565.png base-shuttle-win7-intel-float/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_8888.png --output base-shuttle-win7-intel-float/.temp-test1_8888.png
 mv base-shuttle-win7-intel-float/.temp-test1_8888.png base-shuttle-win7-intel-float/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_gpu.png --output base-shuttle-win7-intel-float/.temp-test1_gpu.png
 mv base-shuttle-win7-intel-float/.temp-test1_gpu.png base-shuttle-win7-intel-float/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_pdf.png --output base-shuttle-win7-intel-float/.temp-test1_pdf.png
 mv base-shuttle-win7-intel-float/.temp-test1_pdf.png base-shuttle-win7-intel-float/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_mesa.png --output base-shuttle-win7-intel-float/.temp-test1_mesa.png
 mv base-shuttle-win7-intel-float/.temp-test1_mesa.png base-shuttle-win7-intel-float/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_msaa16.png --output base-shuttle-win7-intel-float/.temp-test1_msaa16.png
 mv base-shuttle-win7-intel-float/.temp-test1_msaa16.png base-shuttle-win7-intel-float/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_msaa4.png --output base-shuttle-win7-intel-float/.temp-test1_msaa4.png
 mv base-shuttle-win7-intel-float/.temp-test1_msaa4.png base-shuttle-win7-intel-float/test1_msaa4.png

 # base-shuttle-win7-intel-float:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_565.png --output base-shuttle-win7-intel-float/.temp-test2_565.png
 mv base-shuttle-win7-intel-float/.temp-test2_565.png base-shuttle-win7-intel-float/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_8888.png --output base-shuttle-win7-intel-float/.temp-test2_8888.png
 mv base-shuttle-win7-intel-float/.temp-test2_8888.png base-shuttle-win7-intel-float/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_gpu.png --output base-shuttle-win7-intel-float/.temp-test2_gpu.png
 mv base-shuttle-win7-intel-float/.temp-test2_gpu.png base-shuttle-win7-intel-float/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_pdf.png --output base-shuttle-win7-intel-float/.temp-test2_pdf.png
 mv base-shuttle-win7-intel-float/.temp-test2_pdf.png base-shuttle-win7-intel-float/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_mesa.png --output base-shuttle-win7-intel-float/.temp-test2_mesa.png
 mv base-shuttle-win7-intel-float/.temp-test2_mesa.png base-shuttle-win7-intel-float/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_msaa16.png --output base-shuttle-win7-intel-float/.temp-test2_msaa16.png
 mv base-shuttle-win7-intel-float/.temp-test2_msaa16.png base-shuttle-win7-intel-float/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_msaa4.png --output base-shuttle-win7-intel-float/.temp-test2_msaa4.png
 mv base-shuttle-win7-intel-float/.temp-test2_msaa4.png base-shuttle-win7-intel-float/test2_msaa4.png
+# unable to load JSON summary URL file:nonexistent-path/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/actual-results.json

 # base-shuttle_ubuntu12_ati5770:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_565.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_565.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test1_565.png base-shuttle_ubuntu12_ati5770/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_8888.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_8888.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test1_8888.png base-shuttle_ubuntu12_ati5770/test1_8888.png

 # test1_gpu.png
+# unable to find filename test1_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_gpu.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_gpu.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test1_gpu.png base-shuttle_ubuntu12_ati5770/test1_gpu.png

 # test1_pdf.png
+# unable to find filename test1_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_pdf.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_pdf.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test1_pdf.png base-shuttle_ubuntu12_ati5770/test1_pdf.png

 # test1_mesa.png
+# unable to find filename test1_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_mesa.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_mesa.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test1_mesa.png base-shuttle_ubuntu12_ati5770/test1_mesa.png

 # test1_msaa16.png
+# unable to find filename test1_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_msaa16.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_msaa16.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test1_msaa16.png base-shuttle_ubuntu12_ati5770/test1_msaa16.png

 # test1_msaa4.png
+# unable to find filename test1_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_msaa4.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_msaa4.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test1_msaa4.png base-shuttle_ubuntu12_ati5770/test1_msaa4.png

 # base-shuttle_ubuntu12_ati5770:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_565.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_565.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test2_565.png base-shuttle_ubuntu12_ati5770/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_8888.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_8888.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test2_8888.png base-shuttle_ubuntu12_ati5770/test2_8888.png

 # test2_gpu.png
+# unable to find filename test2_gpu.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_gpu.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_gpu.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test2_gpu.png base-shuttle_ubuntu12_ati5770/test2_gpu.png

 # test2_pdf.png
+# unable to find filename test2_pdf.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_pdf.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_pdf.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test2_pdf.png base-shuttle_ubuntu12_ati5770/test2_pdf.png

 # test2_mesa.png
+# unable to find filename test2_mesa.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_mesa.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_mesa.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test2_mesa.png base-shuttle_ubuntu12_ati5770/test2_mesa.png

 # test2_msaa16.png
+# unable to find filename test2_msaa16.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_msaa16.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_msaa16.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test2_msaa16.png base-shuttle_ubuntu12_ati5770/test2_msaa16.png

 # test2_msaa4.png
+# unable to find filename test2_msaa4.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_msaa4.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_msaa4.png
 mv base-shuttle_ubuntu12_ati5770/.temp-test2_msaa4.png base-shuttle_ubuntu12_ati5770/test2_msaa4.png
--- a/tools/tests/rebaseline/output/subset/output-expected/command_line
+++ b/tools/tests/rebaseline/output/subset/output-expected/command_line
@ -1 +1 @@
-python tools/rebaseline.py --dry-run --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
+python tools/rebaseline.py --dry-run --json-base-url file:tools/tests/rebaseline/input/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
--- a/tools/tests/rebaseline/output/subset/output-expected/stdout
+++ b/tools/tests/rebaseline/output/subset/output-expected/stdout
@ -2,39 +2,47 @@
 # base-android-galaxy-nexus:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_565.png --output base-android-galaxy-nexus/.temp-test1_565.png
 mv base-android-galaxy-nexus/.temp-test1_565.png base-android-galaxy-nexus/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_8888.png --output base-android-galaxy-nexus/.temp-test1_8888.png
 mv base-android-galaxy-nexus/.temp-test1_8888.png base-android-galaxy-nexus/test1_8888.png

 # base-android-galaxy-nexus:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_565.png --output base-android-galaxy-nexus/.temp-test2_565.png
 mv base-android-galaxy-nexus/.temp-test2_565.png base-android-galaxy-nexus/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_8888.png --output base-android-galaxy-nexus/.temp-test2_8888.png
 mv base-android-galaxy-nexus/.temp-test2_8888.png base-android-galaxy-nexus/test2_8888.png

 # base-shuttle-win7-intel-float:

 # test1_565.png
+# unable to find filename test1_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_565.png --output base-shuttle-win7-intel-float/.temp-test1_565.png
 mv base-shuttle-win7-intel-float/.temp-test1_565.png base-shuttle-win7-intel-float/test1_565.png

 # test1_8888.png
+# unable to find filename test1_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_8888.png --output base-shuttle-win7-intel-float/.temp-test1_8888.png
 mv base-shuttle-win7-intel-float/.temp-test1_8888.png base-shuttle-win7-intel-float/test1_8888.png

 # base-shuttle-win7-intel-float:

 # test2_565.png
+# unable to find filename test2_565.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_565.png --output base-shuttle-win7-intel-float/.temp-test2_565.png
 mv base-shuttle-win7-intel-float/.temp-test2_565.png base-shuttle-win7-intel-float/test2_565.png

 # test2_8888.png
+# unable to find filename test2_8888.png in all_results dict
 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_8888.png --output base-shuttle-win7-intel-float/.temp-test2_8888.png
 mv base-shuttle-win7-intel-float/.temp-test2_8888.png base-shuttle-win7-intel-float/test2_8888.png
--- a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout
+++ b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout
@ -1,41 +1,41 @@

 #
 # Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/input/json1/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/actual-results.json ...
-# ... found files_to_rebaseline [u'imageblur_565.png', u'imageblur_8888.png', u'shadertext3_8888.png', u'3x3bitmaprect_565.png', u'3x3bitmaprect_8888.png', u'xfermodeimagefilter_pdf.png']
+# ... found files_to_rebaseline [u'3x3bitmaprect_565.png', u'3x3bitmaprect_8888.png', u'imageblur_565.png', u'imageblur_8888.png', u'shadertext3_8888.png', u'xfermodeimagefilter_pdf.png']
 #

-# imageblur_565.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/imageblur_565.png --output base-android-galaxy-nexus/.temp-imageblur_565.png
-mv base-android-galaxy-nexus/.temp-imageblur_565.png base-android-galaxy-nexus/imageblur_565.png
-svn add --quiet base-android-galaxy-nexus/imageblur_565.png
-svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_565.png
-
-# imageblur_8888.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/imageblur_8888.png --output base-android-galaxy-nexus/.temp-imageblur_8888.png
-mv base-android-galaxy-nexus/.temp-imageblur_8888.png base-android-galaxy-nexus/imageblur_8888.png
-svn add --quiet base-android-galaxy-nexus/imageblur_8888.png
-svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_8888.png
-
-# shadertext3_8888.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/shadertext3_8888.png --output base-android-galaxy-nexus/.temp-shadertext3_8888.png
-mv base-android-galaxy-nexus/.temp-shadertext3_8888.png base-android-galaxy-nexus/shadertext3_8888.png
-svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png
-svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext3_8888.png
-
 # 3x3bitmaprect_565.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/3x3bitmaprect_565.png --output base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png
 mv base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png base-android-galaxy-nexus/3x3bitmaprect_565.png
 svn add --quiet base-android-galaxy-nexus/3x3bitmaprect_565.png
 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/3x3bitmaprect_565.png

 # 3x3bitmaprect_8888.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/3x3bitmaprect_8888.png --output base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png
 mv base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png base-android-galaxy-nexus/3x3bitmaprect_8888.png
 svn add --quiet base-android-galaxy-nexus/3x3bitmaprect_8888.png
 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/3x3bitmaprect_8888.png

+# imageblur_565.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/3359963596899141322.png --output base-android-galaxy-nexus/.temp-imageblur_565.png
+mv base-android-galaxy-nexus/.temp-imageblur_565.png base-android-galaxy-nexus/imageblur_565.png
+svn add --quiet base-android-galaxy-nexus/imageblur_565.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_565.png
+
+# imageblur_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output base-android-galaxy-nexus/.temp-imageblur_8888.png
+mv base-android-galaxy-nexus/.temp-imageblur_8888.png base-android-galaxy-nexus/imageblur_8888.png
+svn add --quiet base-android-galaxy-nexus/imageblur_8888.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_8888.png
+
+# shadertext3_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/shadertext3/3713708307125704716.png --output base-android-galaxy-nexus/.temp-shadertext3_8888.png
+mv base-android-galaxy-nexus/.temp-shadertext3_8888.png base-android-galaxy-nexus/shadertext3_8888.png
+svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext3_8888.png
+
 # xfermodeimagefilter_pdf.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/xfermodeimagefilter_pdf.png --output base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png
 mv base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
 svn add --quiet base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
@ -46,19 +46,19 @@ svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/xfermodeim
 #

 # 3x3bitmaprect_565.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/3x3bitmaprect_565.png --output base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png
 mv base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png base-shuttle-win7-intel-float/3x3bitmaprect_565.png
 svn add --quiet base-shuttle-win7-intel-float/3x3bitmaprect_565.png
 svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/3x3bitmaprect_565.png

 # 3x3bitmaprect_8888.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/3x3bitmaprect_8888.png --output base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png
 mv base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
 svn add --quiet base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
 svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/3x3bitmaprect_8888.png

 # xfermodeimagefilter_pdf.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png --output base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png
 mv base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
 svn add --quiet base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
 svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
--- a/tools/tests/rebaseline/output/using-json1/output-expected/stdout
+++ b/tools/tests/rebaseline/output/using-json1/output-expected/stdout
@ -5,15 +5,15 @@
 #

 # imageblur_565.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/imageblur_565.png --output base-android-galaxy-nexus/.temp-imageblur_565.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/3359963596899141322.png --output base-android-galaxy-nexus/.temp-imageblur_565.png
 mv base-android-galaxy-nexus/.temp-imageblur_565.png base-android-galaxy-nexus/imageblur_565.png

 # imageblur_8888.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/imageblur_8888.png --output base-android-galaxy-nexus/.temp-imageblur_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output base-android-galaxy-nexus/.temp-imageblur_8888.png
 mv base-android-galaxy-nexus/.temp-imageblur_8888.png base-android-galaxy-nexus/imageblur_8888.png

 # shadertext3_8888.png
-curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/shadertext3_8888.png --output base-android-galaxy-nexus/.temp-shadertext3_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/shadertext3/3713708307125704716.png --output base-android-galaxy-nexus/.temp-shadertext3_8888.png
 mv base-android-galaxy-nexus/.temp-shadertext3_8888.png base-android-galaxy-nexus/shadertext3_8888.png

 #
--- a/tools/tests/run.sh
+++ b/tools/tests/run.sh
@ -209,8 +209,8 @@ fi

 REBASELINE_INPUT=tools/tests/rebaseline/input
 REBASELINE_OUTPUT=tools/tests/rebaseline/output
-rebaseline_test "--tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset"
-rebaseline_test "--tests test1 test2" "$REBASELINE_OUTPUT/all"
+rebaseline_test "--json-base-url file:$REBASELINE_INPUT/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset"
+rebaseline_test "--json-base-url file:nonexistent-path --tests test1 test2" "$REBASELINE_OUTPUT/all"
 rebaseline_test "--json-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/using-json1"
 rebaseline_test "--json-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new" "$REBASELINE_OUTPUT/using-json1-add-new"