diff options
8 files changed, 113 insertions, 332 deletions
diff --git a/tools/rebaseline.py b/tools/rebaseline.py index 5e8e15fbad..0549b789ae 100755 --- a/tools/rebaseline.py +++ b/tools/rebaseline.py @@ -22,8 +22,15 @@ import urllib2 # Imports from within Skia # -# Make sure that they are in the PYTHONPATH, but add them at the *end* -# so any that are already in the PYTHONPATH will be preferred. +# We need to add the 'gm' directory, so that we can import gm_json.py within +# that directory. That script allows us to parse the actual-results.json file +# written out by the GM tool. +# Make sure that the 'gm' dir is in the PYTHONPATH, but add it at the *end* +# so any dirs that are already in the PYTHONPATH will be preferred. +# +# This assumes that the 'gm' directory has been checked out as a sibling of +# the 'tools' directory containing this script, which will be the case if +# 'trunk' was checked out as a single unit. GM_DIRECTORY = os.path.realpath( os.path.join(os.path.dirname(os.path.dirname(__file__)), 'gm')) if GM_DIRECTORY not in sys.path: @@ -79,8 +86,10 @@ class Rebaseliner(object): # dry_run: if True, instead of actually downloading files or adding # files to checkout, display a list of operations that # we would normally perform + # add_new: if True, add expectations for tests which don't have any yet def __init__(self, json_base_url, json_filename, - subdirs=None, tests=None, configs=None, dry_run=False): + subdirs=None, tests=None, configs=None, dry_run=False, + add_new=False): if configs and not tests: raise ValueError('configs should only be specified if tests ' + 'were specified also') @@ -95,6 +104,7 @@ class Rebaseliner(object): self._json_base_url = json_base_url self._json_filename = json_filename self._dry_run = dry_run + self._add_new = add_new self._is_svn_checkout = ( os.path.exists('.svn') or os.path.exists(os.path.join(os.pardir, '.svn'))) @@ -154,11 +164,13 @@ class Rebaseliner(object): # # 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: + # - JSONKEY_ACTUALRESULTS_FAILED + # - JSONKEY_ACTUALRESULTS_NOCOMPARISON + # if False, then return files listed in these sections: + # - JSONKEY_ACTUALRESULTS_FAILED # - # TODO(epoger): add a parameter indicating whether "no-comparison" - # results (those for which we don't have any expectations yet) - # should be rebaselined. For now, we only return failed expectations. - def _GetFilesToRebaseline(self, json_url): + def _GetFilesToRebaseline(self, json_url, add_new): if self._dry_run: print '' print '#' @@ -176,11 +188,15 @@ class Rebaseliner(object): 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 = [] - failed_results = actual_results[gm_json.JSONKEY_ACTUALRESULTS_FAILED] - if failed_results: - files_to_rebaseline.extend(failed_results.keys()) + for section in sections: + section_results = actual_results[section] + if section_results: + files_to_rebaseline.extend(section_results.keys()) print '# ... found files_to_rebaseline %s' % files_to_rebaseline if self._dry_run: @@ -215,16 +231,17 @@ class Rebaseliner(object): print '# Couldn\'t fetch ' + url return - # Add this file to version control (if it isn't already). - if self._is_svn_checkout: - cmd = [ 'svn', 'add', '--quiet', outfilename ] - self._Call(cmd) - cmd = [ 'svn', 'propset', '--quiet', 'svn:mime-type', 'image/png', - outfilename ]; - self._Call(cmd) - elif self._is_git_checkout: - cmd = [ 'git', 'add', outfilename ] - self._Call(cmd) + # Add this file to version control (if appropriate). + if self._add_new: + if self._is_svn_checkout: + cmd = [ 'svn', 'add', '--quiet', outfilename ] + self._Call(cmd) + cmd = [ 'svn', 'propset', '--quiet', 'svn:mime-type', + 'image/png', outfilename ]; + self._Call(cmd) + elif self._is_git_checkout: + cmd = [ 'git', 'add', outfilename ] + self._Call(cmd) # Rebaseline the given configs for a single test. # @@ -269,7 +286,8 @@ class Rebaseliner(object): json_url = '/'.join([self._json_base_url, subdir, builder_name, subdir, self._json_filename]) - filenames = self._GetFilesToRebaseline(json_url=json_url) + filenames = self._GetFilesToRebaseline(json_url=json_url, + add_new=self._add_new) for filename in filenames: outfilename = os.path.join(subdir, filename); self._RebaselineOneFile(expectations_subdir=subdir, @@ -280,6 +298,11 @@ class Rebaseliner(object): # main... parser = argparse.ArgumentParser() +parser.add_argument('--add-new', action='store_true', + help='in addition to the standard behavior of ' + + 'updating expectations for failing tests, add ' + + 'expectations for tests which don\'t have expectations ' + + 'yet.') parser.add_argument('--configs', metavar='CONFIG', nargs='+', help='which configurations to rebaseline, e.g. ' + '"--configs 565 8888"; if unspecified, run a default ' + @@ -310,5 +333,6 @@ args = parser.parse_args() rebaseliner = Rebaseliner(tests=args.tests, configs=args.configs, subdirs=args.subdirs, dry_run=args.dry_run, json_base_url=args.json_base_url, - json_filename=args.json_filename) + json_filename=args.json_filename, + add_new=args.add_new) rebaseliner.RebaselineAll() diff --git a/tools/tests/rebaseline/output/all/output-expected/stdout b/tools/tests/rebaseline/output/all/output-expected/stdout index 372881bc17..0a2a3feddf 100644 --- a/tools/tests/rebaseline/output/all/output-expected/stdout +++ b/tools/tests/rebaseline/output/all/output-expected/stdout @@ -4,905 +4,617 @@ # test1_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/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 -svn add --quiet base-android-galaxy-nexus/test1_565.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_565.png # test1_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/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 -svn add --quiet base-android-galaxy-nexus/test1_8888.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_8888.png # test1_gpu.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/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 -svn add --quiet base-android-galaxy-nexus/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_gpu.png # test1_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/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 -svn add --quiet base-android-galaxy-nexus/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_pdf.png # test1_mesa.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/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 -svn add --quiet base-android-galaxy-nexus/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_mesa.png # test1_msaa16.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/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 -svn add --quiet base-android-galaxy-nexus/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_msaa16.png # test1_msaa4.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/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 -svn add --quiet base-android-galaxy-nexus/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_msaa4.png # base-android-galaxy-nexus: # test2_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/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 -svn add --quiet base-android-galaxy-nexus/test2_565.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_565.png # test2_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/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 -svn add --quiet base-android-galaxy-nexus/test2_8888.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_8888.png # test2_gpu.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/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 -svn add --quiet base-android-galaxy-nexus/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_gpu.png # test2_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/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 -svn add --quiet base-android-galaxy-nexus/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_pdf.png # test2_mesa.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/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 -svn add --quiet base-android-galaxy-nexus/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_mesa.png # test2_msaa16.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/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 -svn add --quiet base-android-galaxy-nexus/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_msaa16.png # test2_msaa4.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/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 -svn add --quiet base-android-galaxy-nexus/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_msaa4.png # base-android-nexus-10: # test1_565.png 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 -svn add --quiet base-android-nexus-10/test1_565.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_565.png # test1_8888.png 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 -svn add --quiet base-android-nexus-10/test1_8888.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_8888.png # test1_gpu.png 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 -svn add --quiet base-android-nexus-10/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_gpu.png # test1_pdf.png 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 -svn add --quiet base-android-nexus-10/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_pdf.png # test1_mesa.png 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 -svn add --quiet base-android-nexus-10/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_mesa.png # test1_msaa16.png 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 -svn add --quiet base-android-nexus-10/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_msaa16.png # test1_msaa4.png 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 -svn add --quiet base-android-nexus-10/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_msaa4.png # base-android-nexus-10: # test2_565.png 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 -svn add --quiet base-android-nexus-10/test2_565.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_565.png # test2_8888.png 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 -svn add --quiet base-android-nexus-10/test2_8888.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_8888.png # test2_gpu.png 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 -svn add --quiet base-android-nexus-10/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_gpu.png # test2_pdf.png 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 -svn add --quiet base-android-nexus-10/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_pdf.png # test2_mesa.png 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 -svn add --quiet base-android-nexus-10/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_mesa.png # test2_msaa16.png 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 -svn add --quiet base-android-nexus-10/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_msaa16.png # test2_msaa4.png 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 -svn add --quiet base-android-nexus-10/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_msaa4.png # base-android-nexus-7: # test1_565.png 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 -svn add --quiet base-android-nexus-7/test1_565.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_565.png # test1_8888.png 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 -svn add --quiet base-android-nexus-7/test1_8888.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_8888.png # test1_gpu.png 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 -svn add --quiet base-android-nexus-7/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_gpu.png # test1_pdf.png 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 -svn add --quiet base-android-nexus-7/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_pdf.png # test1_mesa.png 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 -svn add --quiet base-android-nexus-7/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_mesa.png # test1_msaa16.png 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 -svn add --quiet base-android-nexus-7/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_msaa16.png # test1_msaa4.png 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 -svn add --quiet base-android-nexus-7/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_msaa4.png # base-android-nexus-7: # test2_565.png 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 -svn add --quiet base-android-nexus-7/test2_565.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_565.png # test2_8888.png 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 -svn add --quiet base-android-nexus-7/test2_8888.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_8888.png # test2_gpu.png 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 -svn add --quiet base-android-nexus-7/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_gpu.png # test2_pdf.png 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 -svn add --quiet base-android-nexus-7/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_pdf.png # test2_mesa.png 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 -svn add --quiet base-android-nexus-7/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_mesa.png # test2_msaa16.png 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 -svn add --quiet base-android-nexus-7/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_msaa16.png # test2_msaa4.png 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 -svn add --quiet base-android-nexus-7/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_msaa4.png # base-android-nexus-s: # test1_565.png 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 -svn add --quiet base-android-nexus-s/test1_565.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_565.png # test1_8888.png 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 -svn add --quiet base-android-nexus-s/test1_8888.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_8888.png # test1_gpu.png 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 -svn add --quiet base-android-nexus-s/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_gpu.png # test1_pdf.png 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 -svn add --quiet base-android-nexus-s/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_pdf.png # test1_mesa.png 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 -svn add --quiet base-android-nexus-s/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_mesa.png # test1_msaa16.png 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 -svn add --quiet base-android-nexus-s/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_msaa16.png # test1_msaa4.png 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 -svn add --quiet base-android-nexus-s/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_msaa4.png # base-android-nexus-s: # test2_565.png 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 -svn add --quiet base-android-nexus-s/test2_565.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_565.png # test2_8888.png 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 -svn add --quiet base-android-nexus-s/test2_8888.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_8888.png # test2_gpu.png 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 -svn add --quiet base-android-nexus-s/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_gpu.png # test2_pdf.png 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 -svn add --quiet base-android-nexus-s/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_pdf.png # test2_mesa.png 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 -svn add --quiet base-android-nexus-s/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_mesa.png # test2_msaa16.png 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 -svn add --quiet base-android-nexus-s/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_msaa16.png # test2_msaa4.png 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 -svn add --quiet base-android-nexus-s/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_msaa4.png # base-android-xoom: # test1_565.png 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 -svn add --quiet base-android-xoom/test1_565.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test1_565.png # test1_8888.png 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 -svn add --quiet base-android-xoom/test1_8888.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test1_8888.png # test1_gpu.png 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 -svn add --quiet base-android-xoom/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test1_gpu.png # test1_pdf.png 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 -svn add --quiet base-android-xoom/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test1_pdf.png # test1_mesa.png 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 -svn add --quiet base-android-xoom/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test1_mesa.png # test1_msaa16.png 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 -svn add --quiet base-android-xoom/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test1_msaa16.png # test1_msaa4.png 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 -svn add --quiet base-android-xoom/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test1_msaa4.png # base-android-xoom: # test2_565.png 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 -svn add --quiet base-android-xoom/test2_565.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test2_565.png # test2_8888.png 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 -svn add --quiet base-android-xoom/test2_8888.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test2_8888.png # test2_gpu.png 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 -svn add --quiet base-android-xoom/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test2_gpu.png # test2_pdf.png 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 -svn add --quiet base-android-xoom/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test2_pdf.png # test2_mesa.png 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 -svn add --quiet base-android-xoom/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test2_mesa.png # test2_msaa16.png 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 -svn add --quiet base-android-xoom/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test2_msaa16.png # test2_msaa4.png 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 -svn add --quiet base-android-xoom/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-android-xoom/test2_msaa4.png # base-macmini: # test1_565.png 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 -svn add --quiet base-macmini/test1_565.png -svn propset --quiet svn:mime-type image/png base-macmini/test1_565.png # test1_8888.png 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 -svn add --quiet base-macmini/test1_8888.png -svn propset --quiet svn:mime-type image/png base-macmini/test1_8888.png # test1_gpu.png 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 -svn add --quiet base-macmini/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-macmini/test1_gpu.png # test1_pdf.png 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 -svn add --quiet base-macmini/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-macmini/test1_pdf.png # test1_mesa.png 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 -svn add --quiet base-macmini/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-macmini/test1_mesa.png # test1_msaa16.png 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 -svn add --quiet base-macmini/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-macmini/test1_msaa16.png # test1_msaa4.png 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 -svn add --quiet base-macmini/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-macmini/test1_msaa4.png # base-macmini: # test2_565.png 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 -svn add --quiet base-macmini/test2_565.png -svn propset --quiet svn:mime-type image/png base-macmini/test2_565.png # test2_8888.png 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 -svn add --quiet base-macmini/test2_8888.png -svn propset --quiet svn:mime-type image/png base-macmini/test2_8888.png # test2_gpu.png 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 -svn add --quiet base-macmini/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-macmini/test2_gpu.png # test2_pdf.png 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 -svn add --quiet base-macmini/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-macmini/test2_pdf.png # test2_mesa.png 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 -svn add --quiet base-macmini/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-macmini/test2_mesa.png # test2_msaa16.png 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 -svn add --quiet base-macmini/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-macmini/test2_msaa16.png # test2_msaa4.png 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 -svn add --quiet base-macmini/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-macmini/test2_msaa4.png # base-macmini-lion-float: # test1_565.png 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 -svn add --quiet base-macmini-lion-float/test1_565.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_565.png # test1_8888.png 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 -svn add --quiet base-macmini-lion-float/test1_8888.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_8888.png # test1_gpu.png 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 -svn add --quiet base-macmini-lion-float/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_gpu.png # test1_pdf.png 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 -svn add --quiet base-macmini-lion-float/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_pdf.png # test1_mesa.png 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 -svn add --quiet base-macmini-lion-float/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_mesa.png # test1_msaa16.png 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 -svn add --quiet base-macmini-lion-float/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_msaa16.png # test1_msaa4.png 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 -svn add --quiet base-macmini-lion-float/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_msaa4.png # base-macmini-lion-float: # test2_565.png 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 -svn add --quiet base-macmini-lion-float/test2_565.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_565.png # test2_8888.png 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 -svn add --quiet base-macmini-lion-float/test2_8888.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_8888.png # test2_gpu.png 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 -svn add --quiet base-macmini-lion-float/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_gpu.png # test2_pdf.png 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 -svn add --quiet base-macmini-lion-float/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_pdf.png # test2_mesa.png 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 -svn add --quiet base-macmini-lion-float/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_mesa.png # test2_msaa16.png 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 -svn add --quiet base-macmini-lion-float/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_msaa16.png # test2_msaa4.png 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 -svn add --quiet base-macmini-lion-float/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_msaa4.png # base-shuttle-win7-intel-angle: # test1_angle.png 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 -svn add --quiet base-shuttle-win7-intel-angle/test1_angle.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-angle/test1_angle.png # test1_anglemsaa16.png 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 -svn add --quiet base-shuttle-win7-intel-angle/test1_anglemsaa16.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-angle/test1_anglemsaa16.png # base-shuttle-win7-intel-angle: # test2_angle.png 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 -svn add --quiet base-shuttle-win7-intel-angle/test2_angle.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-angle/test2_angle.png # test2_anglemsaa16.png 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 -svn add --quiet base-shuttle-win7-intel-angle/test2_anglemsaa16.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-angle/test2_anglemsaa16.png # base-shuttle-win7-intel-directwrite: # test1_565.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test1_565.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_565.png # test1_8888.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test1_8888.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_8888.png # test1_gpu.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_gpu.png # test1_pdf.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_pdf.png # test1_mesa.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_mesa.png # test1_msaa16.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_msaa16.png # test1_msaa4.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_msaa4.png # base-shuttle-win7-intel-directwrite: # test2_565.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test2_565.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_565.png # test2_8888.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test2_8888.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_8888.png # test2_gpu.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_gpu.png # test2_pdf.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_pdf.png # test2_mesa.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_mesa.png # test2_msaa16.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_msaa16.png # test2_msaa4.png 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 -svn add --quiet base-shuttle-win7-intel-directwrite/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_msaa4.png # base-shuttle-win7-intel-float: # test1_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/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 -svn add --quiet base-shuttle-win7-intel-float/test1_565.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_565.png # test1_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/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 -svn add --quiet base-shuttle-win7-intel-float/test1_8888.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_8888.png # test1_gpu.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/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 -svn add --quiet base-shuttle-win7-intel-float/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_gpu.png # test1_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/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 -svn add --quiet base-shuttle-win7-intel-float/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_pdf.png # test1_mesa.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/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 -svn add --quiet base-shuttle-win7-intel-float/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_mesa.png # test1_msaa16.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/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 -svn add --quiet base-shuttle-win7-intel-float/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_msaa16.png # test1_msaa4.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/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 -svn add --quiet base-shuttle-win7-intel-float/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_msaa4.png # base-shuttle-win7-intel-float: # test2_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/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 -svn add --quiet base-shuttle-win7-intel-float/test2_565.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_565.png # test2_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/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 -svn add --quiet base-shuttle-win7-intel-float/test2_8888.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_8888.png # test2_gpu.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/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 -svn add --quiet base-shuttle-win7-intel-float/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_gpu.png # test2_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/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 -svn add --quiet base-shuttle-win7-intel-float/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_pdf.png # test2_mesa.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/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 -svn add --quiet base-shuttle-win7-intel-float/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_mesa.png # test2_msaa16.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/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 -svn add --quiet base-shuttle-win7-intel-float/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_msaa16.png # test2_msaa4.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/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 -svn add --quiet base-shuttle-win7-intel-float/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_msaa4.png # base-shuttle_ubuntu12_ati5770: # test1_565.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test1_565.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_565.png # test1_8888.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test1_8888.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_8888.png # test1_gpu.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test1_gpu.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_gpu.png # test1_pdf.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test1_pdf.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_pdf.png # test1_mesa.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test1_mesa.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_mesa.png # test1_msaa16.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test1_msaa16.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_msaa16.png # test1_msaa4.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test1_msaa4.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_msaa4.png # base-shuttle_ubuntu12_ati5770: # test2_565.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test2_565.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_565.png # test2_8888.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test2_8888.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_8888.png # test2_gpu.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test2_gpu.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_gpu.png # test2_pdf.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test2_pdf.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_pdf.png # test2_mesa.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test2_mesa.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_mesa.png # test2_msaa16.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test2_msaa16.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_msaa16.png # test2_msaa4.png 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 -svn add --quiet base-shuttle_ubuntu12_ati5770/test2_msaa4.png -svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_msaa4.png diff --git a/tools/tests/rebaseline/output/subset/output-expected/stdout b/tools/tests/rebaseline/output/subset/output-expected/stdout index be649f1a12..7ed619e630 100644 --- a/tools/tests/rebaseline/output/subset/output-expected/stdout +++ b/tools/tests/rebaseline/output/subset/output-expected/stdout @@ -4,53 +4,37 @@ # test1_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/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 -svn add --quiet base-android-galaxy-nexus/test1_565.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_565.png # test1_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/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 -svn add --quiet base-android-galaxy-nexus/test1_8888.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_8888.png # base-android-galaxy-nexus: # test2_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/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 -svn add --quiet base-android-galaxy-nexus/test2_565.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_565.png # test2_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/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 -svn add --quiet base-android-galaxy-nexus/test2_8888.png -svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_8888.png # base-shuttle-win7-intel-float: # test1_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/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 -svn add --quiet base-shuttle-win7-intel-float/test1_565.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_565.png # test1_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/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 -svn add --quiet base-shuttle-win7-intel-float/test1_8888.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_8888.png # base-shuttle-win7-intel-float: # test2_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/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 -svn add --quiet base-shuttle-win7-intel-float/test2_565.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_565.png # test2_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/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 -svn add --quiet base-shuttle-win7-intel-float/test2_8888.png -svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_8888.png diff --git a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line new file mode 100644 index 0000000000..32bd0ef9e7 --- /dev/null +++ b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line @@ -0,0 +1 @@ +python tools/rebaseline.py --dry-run --json-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new diff --git a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/return_value b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/return_value new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/return_value @@ -0,0 +1 @@ +0 diff --git a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout new file mode 100644 index 0000000000..9984d2d51e --- /dev/null +++ b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout @@ -0,0 +1,64 @@ + +# +# 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'] +# + +# 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 +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 +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 + +# 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 +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 + +# +# Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/input/json1/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json ... +# ... found files_to_rebaseline [u'3x3bitmaprect_565.png', u'3x3bitmaprect_8888.png', u'xfermodeimagefilter_pdf.png'] +# + +# 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 +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 +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 +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 diff --git a/tools/tests/rebaseline/output/using-json1/output-expected/stdout b/tools/tests/rebaseline/output/using-json1/output-expected/stdout index 917a67289a..34463450b6 100644 --- a/tools/tests/rebaseline/output/using-json1/output-expected/stdout +++ b/tools/tests/rebaseline/output/using-json1/output-expected/stdout @@ -7,20 +7,14 @@ # 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 # # Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/input/json1/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json ... diff --git a/tools/tests/run.sh b/tools/tests/run.sh index 6d52c651f7..337e883d3d 100755 --- a/tools/tests/run.sh +++ b/tools/tests/run.sh @@ -212,5 +212,6 @@ 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 --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" echo "All tests passed." |