rebaseline.py: --tests and --configs are now FILTERS within json results

tools/tests/run.sh

Index: tools/tests/run.sh
===================================================================
--- tools/tests/run.sh	(revision 9460)
+++ tools/tests/run.sh	(working copy)
@@ -129,8 +129,8 @@
   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 @@
 
   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
@@ -196,9 +196,11 @@
 
 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"
+BASELINE_OPTIONS="--json-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-macmini base-shuttle-win7-intel-float"
+rebaseline_test "$BASELINE_OPTIONS" "$REBASELINE_OUTPUT/all"
+rebaseline_test "$BASELINE_OPTIONS --configs 8888 pdf" "$REBASELINE_OUTPUT/configs"
+rebaseline_test "$BASELINE_OPTIONS --tests aa imageblur" "$REBASELINE_OUTPUT/tests"
+rebaseline_test "$BASELINE_OPTIONS --tests aaclip --add-new" "$REBASELINE_OUTPUT/add-new-tests"
 
 
 echo "All tests passed."