From 41056232e471e0f5448e88dabe0ef4c5e50f21e6 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 24 Mar 2014 19:51:57 +0000 Subject: fix compare_to_expectations command line launch (SkipBuildbotRuns) NOTREECHECKS=True NOTRY=True R=rmistry@google.com TBR=rmistry Author: epoger@google.com Review URL: https://codereview.chromium.org/210093003 git-svn-id: http://skia.googlecode.com/svn/trunk@13921 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/rebaseline_server/compare_to_expectations.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gm/rebaseline_server/compare_to_expectations.py b/gm/rebaseline_server/compare_to_expectations.py index f047b7b291..e0fa23fb2d 100755 --- a/gm/rebaseline_server/compare_to_expectations.py +++ b/gm/rebaseline_server/compare_to_expectations.py @@ -466,7 +466,8 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument( '--actuals', default=DEFAULT_ACTUALS_DIR, - help='Directory containing all actual-result JSON files') + help='Directory containing all actual-result JSON files; defaults to ' + '\'%(default)s\' .') parser.add_argument( '--expectations', default=DEFAULT_EXPECTATIONS_DIR, help='Directory containing all expected-result JSON files; defaults to ' @@ -485,11 +486,11 @@ def main(): help='Directory within which to download images and generate diffs; ' 'defaults to \'%(default)s\' .') args = parser.parse_args() - results = Results(actuals_root=args.actuals, - expected_root=args.expectations, - generated_images_root=args.workdir) + results_obj = Results(actuals_root=args.actuals, + expected_root=args.expectations, + generated_images_root=args.workdir) gm_json.WriteToFile( - results.get_packaged_results_of_type(results_type=args.results), + results_obj.get_packaged_results_of_type(results_type=args.results), args.outfile) -- cgit v1.2.3