From 82f317815e182fd2e34a8a41eba9ea90e01b0846 Mon Sep 17 00:00:00 2001
From: "epoger@google.com"
 <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Tue, 11 Jun 2013 15:45:46 +0000
Subject: [PATCH] rebaseline.py: in option names, replace underscores with
 hyphens

Split off of already-reviewed https://codereview.chromium.org/15789010/ ('rebaseline.py: --tests and --configs are now FILTERS within json results')

Review URL: https://codereview.chromium.org/15904018

git-svn-id: http://skia.googlecode.com/svn/trunk@9504 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 tools/rebaseline.py                                       | 6 +++---
 .../rebaseline/output/all/output-expected/command_line    | 2 +-
 .../rebaseline/output/subset/output-expected/command_line | 2 +-
 .../output/using-json1/output-expected/command_line       | 2 +-
 tools/tests/run.sh                                        | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/rebaseline.py b/tools/rebaseline.py
index 2b84ff7565..5d8ff7a06a 100755
--- a/tools/rebaseline.py
+++ b/tools/rebaseline.py
@@ -259,15 +259,15 @@ parser.add_argument('--configs', metavar='CONFIG', nargs='+',
                     '"--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',
                     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')
diff --git a/tools/tests/rebaseline/output/all/output-expected/command_line b/tools/tests/rebaseline/output/all/output-expected/command_line
index 3b6c8fd1f5..3c769c3954 100644
--- a/tools/tests/rebaseline/output/all/output-expected/command_line
+++ b/tools/tests/rebaseline/output/all/output-expected/command_line
@@ -1 +1 @@
-python tools/rebaseline.py --dry_run --tests test1 test2
+python tools/rebaseline.py --dry-run --tests test1 test2
diff --git a/tools/tests/rebaseline/output/subset/output-expected/command_line b/tools/tests/rebaseline/output/subset/output-expected/command_line
index b71d705bc2..262b12b302 100644
--- a/tools/tests/rebaseline/output/subset/output-expected/command_line
+++ b/tools/tests/rebaseline/output/subset/output-expected/command_line
@@ -1 +1 @@
-python tools/rebaseline.py --dry_run --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
+python tools/rebaseline.py --dry-run --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
diff --git a/tools/tests/rebaseline/output/using-json1/output-expected/command_line b/tools/tests/rebaseline/output/using-json1/output-expected/command_line
index d905e61e61..14624e14db 100644
--- a/tools/tests/rebaseline/output/using-json1/output-expected/command_line
+++ b/tools/tests/rebaseline/output/using-json1/output-expected/command_line
@@ -1 +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
+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
diff --git a/tools/tests/run.sh b/tools/tests/run.sh
index cfc3c5bfa7..6d52c651f7 100755
--- a/tools/tests/run.sh
+++ b/tools/tests/run.sh
@@ -129,8 +129,8 @@ function benchgraph_test {
   compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
 }
 
-# Run rebaseline.py with arguments in $1, recording its dry_run output.
-# Then compare that dry_run output to the content of $2/output-expected.
+# Run rebaseline.py with arguments in $1, recording its dry-run output.
+# Then compare that dry-run output to the content of $2/output-expected.
 function rebaseline_test {
   if [ $# != 2 ]; then
     echo "rebaseline_test requires exactly 2 parameters, got $#"
@@ -142,7 +142,7 @@ function rebaseline_test {
 
   rm -rf $ACTUAL_OUTPUT_DIR
   mkdir -p $ACTUAL_OUTPUT_DIR
-  COMMAND="python tools/rebaseline.py --dry_run $ARGS"
+  COMMAND="python tools/rebaseline.py --dry-run $ARGS"
   echo "$COMMAND" >$ACTUAL_OUTPUT_DIR/command_line
   $COMMAND &>$ACTUAL_OUTPUT_DIR/stdout
   echo $? >$ACTUAL_OUTPUT_DIR/return_value
@@ -211,6 +211,6 @@ REBASELINE_INPUT=tools/tests/rebaseline/input
 REBASELINE_OUTPUT=tools/tests/rebaseline/output
 rebaseline_test "--tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset"
 rebaseline_test "--tests test1 test2" "$REBASELINE_OUTPUT/all"
-rebaseline_test "--json_base_url file:$REBASELINE_INPUT/json1 --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" "$REBASELINE_OUTPUT/using-json1"
 
 echo "All tests passed."