rebaseline.py: error out early if --expectations-root not pointing at gm-expected dir
BUG=https://code.google.com/p/skia/issues/detail?id=1403 R=senorblanco@chromium.org Review URL: https://codereview.chromium.org/18416005 git-svn-id: http://skia.googlecode.com/svn/trunk@9961 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
epoger@google.com
parent
5396a048d2
commit
89fa4b9ee6
@ -188,10 +188,6 @@ class JsonRebaseliner(object):
|
||||
# Write out updated expectations.
|
||||
gm_json.WriteToFile(expectations_dict, expectations_json_filepath)
|
||||
|
||||
if skipped_images:
|
||||
print ('Skipped these tests due to test/config filters: %s' %
|
||||
skipped_images)
|
||||
|
||||
|
||||
# main...
|
||||
|
||||
@ -275,6 +271,12 @@ for subdir in subdirs:
|
||||
actuals_filename=args.actuals_filename,
|
||||
add_new=args.add_new)
|
||||
else:
|
||||
# TODO(epoger): When we get rid of the ImageRebaseliner implementation,
|
||||
# we should raise an Exception in this case (no JSON expectations file
|
||||
# found to update), to prevent a recurrence of
|
||||
# https://code.google.com/p/skia/issues/detail?id=1403 ('rebaseline.py
|
||||
# script fails with misleading output when run outside of gm-expected
|
||||
# dir')
|
||||
rebaseliner = rebaseline_imagefiles.ImageRebaseliner(
|
||||
expectations_root=args.expectations_root,
|
||||
tests=args.tests, configs=args.configs,
|
||||
|
||||
@ -96,31 +96,29 @@ class ImageRebaseliner(object):
|
||||
raise CommandFailedException('error running command: ' +
|
||||
' '.join(cmd))
|
||||
|
||||
# Download a single actual result from GoogleStorage, returning True if it
|
||||
# succeeded.
|
||||
# Download a single actual result from GoogleStorage.
|
||||
# Raises an exception if it fails.
|
||||
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
|
||||
raise Exception('unable to find test_name for infilename %s' %
|
||||
infilename)
|
||||
try:
|
||||
hash_type, hash_value = all_results[infilename]
|
||||
except KeyError:
|
||||
print ('# unable to find filename %s in all_results dict' %
|
||||
infilename)
|
||||
return False
|
||||
raise Exception('unable to find filename %s in all_results dict' %
|
||||
infilename)
|
||||
except ValueError as e:
|
||||
print '# ValueError reading filename %s from all_results dict: %s'%(
|
||||
infilename, e)
|
||||
return False
|
||||
raise Exception(
|
||||
'ValueError reading filename %s from all_results dict: %s' % (
|
||||
infilename, e))
|
||||
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
|
||||
raise Exception('Couldn\'t fetch gs_url %s as outfile %s' % (
|
||||
url, outfilename))
|
||||
|
||||
# Download a single file, raising a CommandFailedException if it fails.
|
||||
def _DownloadFile(self, source_url, dest_filename):
|
||||
@ -230,14 +228,11 @@ class ImageRebaseliner(object):
|
||||
print ''
|
||||
print '# ' + infilename
|
||||
|
||||
# Download this result image from Google Storage; if that fails,
|
||||
# raise an exception (because if actual-results.json told us that
|
||||
# a particular image version is available for download, we should
|
||||
# always be able to get it!)
|
||||
if not self._DownloadFromGoogleStorage(infilename=infilename,
|
||||
outfilename=outfilename,
|
||||
all_results=all_results):
|
||||
raise Exception('# Couldn\'t fetch infilename ' + infilename)
|
||||
# Download this result image from Google Storage.
|
||||
# If it fails, an exception will be raised.
|
||||
self._DownloadFromGoogleStorage(infilename=infilename,
|
||||
outfilename=outfilename,
|
||||
all_results=all_results)
|
||||
|
||||
# Add this file to version control (if appropriate).
|
||||
if self._add_new:
|
||||
@ -258,6 +253,12 @@ class ImageRebaseliner(object):
|
||||
# subdir : e.g. 'base-shuttle-win7-intel-float'
|
||||
# builder : e.g. 'Test-Win7-ShuttleA-HD2000-x86-Release'
|
||||
def RebaselineSubdir(self, subdir, builder):
|
||||
if not os.path.isdir(os.path.join(self._expectations_root, subdir)):
|
||||
raise Exception((
|
||||
'Could not find "%s" subdir within expectations_root "%s". ' +
|
||||
'Are you sure --expectations-root is pointing at a valid ' +
|
||||
'gm-expected directory?') % (subdir, self._expectations_root))
|
||||
|
||||
json_url = '/'.join([self._json_base_url,
|
||||
subdir, builder, subdir,
|
||||
self._json_filename])
|
||||
@ -275,13 +276,10 @@ class ImageRebaseliner(object):
|
||||
if config not in self._configs:
|
||||
skipped_files.append(filename)
|
||||
continue
|
||||
outfilename = os.path.join(subdir, filename);
|
||||
outfilename = os.path.join(self._expectations_root, subdir,
|
||||
filename);
|
||||
self._RebaselineOneFile(expectations_subdir=subdir,
|
||||
builder_name=builder,
|
||||
infilename=filename,
|
||||
outfilename=outfilename,
|
||||
all_results=all_results)
|
||||
|
||||
if skipped_files:
|
||||
print ('Skipped these files due to test/config filters: %s' %
|
||||
skipped_files)
|
||||
|
||||
1
tools/tests/rebaseline/input/fake-gm-expected-dir/README
Normal file
1
tools/tests/rebaseline/input/fake-gm-expected-dir/README
Normal file
@ -0,0 +1 @@
|
||||
This directory pretends to be a checkout of gm-expected, with platform subdirs as expected.
|
||||
@ -0,0 +1 @@
|
||||
pretend gm-expected directory for a single platform
|
||||
@ -0,0 +1 @@
|
||||
pretend gm-expected directory for a single platform
|
||||
@ -0,0 +1 @@
|
||||
python tools/rebaseline.py --dry-run --expectations-root tools/tests/rebaseline/input --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
|
||||
@ -0,0 +1 @@
|
||||
1
|
||||
@ -0,0 +1,6 @@
|
||||
Traceback (most recent call last):
|
||||
File "tools/rebaseline.py", line 288, in <module>
|
||||
rebaseliner.RebaselineSubdir(subdir=subdir, builder=builder)
|
||||
File "/usr/local/google/home/epoger/src/skia/white/trunk/tools/rebaseline_imagefiles.py", line 260, in RebaselineSubdir
|
||||
'gm-expected directory?') % (subdir, self._expectations_root))
|
||||
Exception: Could not find "base-android-galaxy-nexus" subdir within expectations_root "tools/tests/rebaseline/input". Are you sure --expectations-root is pointing at a valid gm-expected directory?
|
||||
@ -1 +1 @@
|
||||
python tools/rebaseline.py --dry-run --expectations-root fake/expectations/path --actuals-base-url file:tools/tests/rebaseline/input/json1 --tests nonexistenttest1 imageblur nonexistenttest2 --configs nonexistentconfig1 8888 nonexistentconfig2 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
|
||||
python tools/rebaseline.py --dry-run --expectations-root tools/tests/rebaseline/input/fake-gm-expected-dir --actuals-base-url file:tools/tests/rebaseline/input/json1 --tests nonexistenttest1 imageblur nonexistenttest2 --configs nonexistentconfig1 8888 nonexistentconfig2 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
|
||||
|
||||
@ -5,9 +5,8 @@
|
||||
#
|
||||
|
||||
# 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
|
||||
Skipped these files due to test/config filters: [u'imageblur_565.png', u'shadertext3_8888.png']
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_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 ...
|
||||
|
||||
@ -1 +1 @@
|
||||
python tools/rebaseline.py --dry-run --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new
|
||||
python tools/rebaseline.py --dry-run --expectations-root tools/tests/rebaseline/input/fake-gm-expected-dir --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new
|
||||
|
||||
@ -5,40 +5,40 @@
|
||||
#
|
||||
|
||||
# 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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_565.png
|
||||
svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_565.png
|
||||
svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_565.png
|
||||
|
||||
# 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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_8888.png
|
||||
svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_8888.png
|
||||
svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/3359963596899141322.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_565.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_565.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_565.png
|
||||
svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_565.png
|
||||
svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_8888.png
|
||||
svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_8888.png
|
||||
svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/shadertext3/3713708307125704716.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-shadertext3_8888.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-shadertext3_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/shadertext3_8888.png
|
||||
svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/shadertext3_8888.png
|
||||
svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/shadertext3_8888.png
|
||||
|
||||
# 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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
|
||||
svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
|
||||
svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/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 ...
|
||||
@ -46,19 +46,19 @@ svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/xfermodeim
|
||||
#
|
||||
|
||||
# 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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_565.png
|
||||
svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_565.png
|
||||
svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_565.png
|
||||
|
||||
# 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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
|
||||
svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
|
||||
svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
|
||||
|
||||
# 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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
|
||||
svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
|
||||
svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
|
||||
|
||||
@ -1 +1 @@
|
||||
python tools/rebaseline.py --dry-run --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
|
||||
python tools/rebaseline.py --dry-run --expectations-root tools/tests/rebaseline/input/fake-gm-expected-dir --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
#
|
||||
|
||||
# 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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/3359963596899141322.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_565.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_565.png tools/tests/rebaseline/input/fake-gm-expected-dir/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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/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
|
||||
curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/shadertext3/3713708307125704716.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-shadertext3_8888.png
|
||||
mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-shadertext3_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/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 ...
|
||||
|
||||
@ -267,9 +267,10 @@ REBASELINE_INPUT=tools/tests/rebaseline/input
|
||||
REBASELINE_OUTPUT=tools/tests/rebaseline/output
|
||||
|
||||
# These test the old image-file expectations.
|
||||
rebaseline_images_test "--expectations-root fake/expectations/path --actuals-base-url file:$REBASELINE_INPUT/json1 --tests nonexistenttest1 imageblur nonexistenttest2 --configs nonexistentconfig1 8888 nonexistentconfig2 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset"
|
||||
rebaseline_images_test "--actuals-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/using-json1"
|
||||
rebaseline_images_test "--actuals-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new" "$REBASELINE_OUTPUT/using-json1-add-new"
|
||||
rebaseline_images_test "--expectations-root $REBASELINE_INPUT/fake-gm-expected-dir --actuals-base-url file:$REBASELINE_INPUT/json1 --tests nonexistenttest1 imageblur nonexistenttest2 --configs nonexistentconfig1 8888 nonexistentconfig2 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset"
|
||||
rebaseline_images_test "--expectations-root $REBASELINE_INPUT/fake-gm-expected-dir --actuals-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/using-json1"
|
||||
rebaseline_images_test "--expectations-root $REBASELINE_INPUT/fake-gm-expected-dir --actuals-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new" "$REBASELINE_OUTPUT/using-json1-add-new"
|
||||
rebaseline_images_test "--expectations-root $REBASELINE_INPUT --actuals-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/exercise-bug1403"
|
||||
|
||||
# These test the new JSON-format expectations.
|
||||
rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/using-json1-expectations"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user