Index: tools/rebaseline.py |
=================================================================== |
--- tools/rebaseline.py (revision 9460) |
+++ tools/rebaseline.py (working copy) |
@@ -173,23 +173,12 @@ |
expectations_subdir + '/' + builder_name + '/' + |
expectations_subdir + '/' + infilename) |
- # Try to download this file, but if that fails, keep going... |
+ # Try to download this file. |
# |
- # This not treated as a fatal failure because not all |
- # platforms generate all configs (e.g., Android does not |
- # generate PDF). |
- # |
- # We could tweak the list of configs within this tool to |
- # reflect which combinations the bots actually generate, and |
- # then fail if any of those expected combinations are |
- # missing... but then this tool would become useless every |
- # time someone tweaked the configs on the bots without |
- # updating this script. |
- try: |
- self._DownloadFile(source_url=url, dest_filename=outfilename) |
- except CommandFailedException: |
- print '# Couldn\'t fetch ' + url |
- return |
+ # If the download fails, this will raise an exception and halt the |
+ # rebaseline process. Since the JSON results summary told us that |
+ # this file needed rebaselining, we ought to be able to download it... |
+ self._DownloadFile(source_url=url, dest_filename=outfilename) |
# Add this file to version control (if it isn't already). |
if self._is_svn_checkout: |
@@ -259,15 +248,15 @@ |
'"--configs 565 8888"; if unspecified, run a default ' + |
'set of configs. This should ONLY be specified if ' + |
'--tests has also been specified.') |
-parser.add_argument('--dry_run', action='store_true', |
+parser.add_argument('--dry-run', action='store_true', |
epoger
2013/06/06 17:54:30
Patchset 2 renames the command-line arguments: use
|
help='instead of actually downloading files or adding ' + |
'files to checkout, display a list of operations that ' + |
'we would normally perform') |
-parser.add_argument('--json_base_url', |
+parser.add_argument('--json-base-url', |
help='base URL from which to read JSON_FILENAME ' + |
'files; defaults to %(default)s', |
default='http://skia-autogen.googlecode.com/svn/gm-actual') |
-parser.add_argument('--json_filename', |
+parser.add_argument('--json-filename', |
help='filename (under JSON_BASE_URL) to read a summary ' + |
'of results from; defaults to %(default)s', |
default='actual-results.json') |