diff options
author | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-11 15:45:46 +0000 |
---|---|---|
committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-11 15:45:46 +0000 |
commit | 82f317815e182fd2e34a8a41eba9ea90e01b0846 (patch) | |
tree | 8a2a334e8f1ab9260723b8b5ca08d00b82fea203 /tools/tests/run.sh | |
parent | 0a1c3872de6642ada98bd7226ff9ed14750241b9 (diff) |
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
Diffstat (limited to 'tools/tests/run.sh')
-rwxr-xr-x | tools/tests/run.sh | 8 |
1 files changed, 4 insertions, 4 deletions
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." |