remove self-tests for no-longer-supported rebaseline.py

tools/tests/run.sh

 #!/bin/bash
 
 # Tests for our tools.
 #
 # TODO: currently, this only passes on Linux (which is the platform that
 # the housekeeper bot runs on, e.g.
 # http://70.32.156.51:10117/builders/Skia_PerCommit_House_Keeping/builds/1415/steps/RunToolSelfTests/logs/stdio )
 # See https://code.google.com/p/skia/issues/detail?id=677
 # ('make tools/tests/run.sh work cross-platform')
 # Ideally, these tests should pass on all development platforms...
@@ skipping 108 matching lines @@
   $COMMAND 2>$ACTUAL_OUTPUT_DIR/stderr
   echo $? >$ACTUAL_OUTPUT_DIR/return_value
   END_TIMESTAMP=$(date +%s)
 
   SECONDS_RUN=$(expr $END_TIMESTAMP - $START_TIMESTAMP)
   echo "check_bench_regressions.py took $SECONDS_RUN seconds to complete"
 
   compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
 }
 
-# Test rebaseline.py's JSON-format expectations rebaselining capability.
-#
-# Copy expected-results.json files from $1 into a dir where they can be modified.
-# Run rebaseline.py with arguments in $2, recording its output.
-# Then compare the output (and modified expected-results.json files) to the
-# content of $2/output-expected.
-function rebaseline_test {
-  if [ $# != 3 ]; then
-    echo "rebaseline_test requires exactly 3 parameters, got $#"
-    exit 1
-  fi
-  COPY_EXPECTATIONS_FROM_DIR="$1"
-  ARGS="$2"
-  ACTUAL_OUTPUT_DIR="$3/output-actual"
-  EXPECTED_OUTPUT_DIR="$3/output-expected"
-
-  rm -rf $ACTUAL_OUTPUT_DIR
-  mkdir -p $ACTUAL_OUTPUT_DIR
-  EXPECTATIONS_TO_MODIFY_DIR="$ACTUAL_OUTPUT_DIR/gm-expectations"
-  BUILDERS=$(ls $COPY_EXPECTATIONS_FROM_DIR)
-  for BUILDER in $BUILDERS; do
-    mkdir -p $EXPECTATIONS_TO_MODIFY_DIR/$BUILDER
-    cp $COPY_EXPECTATIONS_FROM_DIR/$BUILDER/expected-results.json \
-       $EXPECTATIONS_TO_MODIFY_DIR/$BUILDER
-  done
-  COMMAND="python tools/rebaseline.py --expectations-root $EXPECTATIONS_TO_MODIFY_DIR $ARGS"
-  echo "$COMMAND" >$ACTUAL_OUTPUT_DIR/command_line
-  $COMMAND &>$ACTUAL_OUTPUT_DIR/stdout
-  echo $? >$ACTUAL_OUTPUT_DIR/return_value
-
-  compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
-}
-
 # Run jsondiff.py with arguments in $1, recording its output.
 # Then compare that output to the content of $2/output-expected.
 function jsondiff_test {
   if [ $# != 2 ]; then
     echo "jsondiff_test requires exactly 2 parameters, got $#"
     exit 1
   fi
   ARGS="$1"
   ACTUAL_OUTPUT_DIR="$2/output-actual"
   EXPECTED_OUTPUT_DIR="$2/output-expected"
@@ skipping 38 matching lines @@
 #
 
 # Parse a collection of bench data
 PLATFORM=Perf-Android-Nexus7-Tegra3-Arm7-Release
 REVISION=69c9e1a7261a3c8361e2b2c109d6340862149e34
 download_bench_rawdata $PLATFORM $REVISION "$BENCHDATA_FILE_SUFFIXES_NO_INDIVIDUAL_TILES"
 download_bench_rawdata $PLATFORM $REVISION "$BENCHDATA_FILE_SUFFIXES_YES_INDIVIDUAL_TILES"
 benchalert_test $PLATFORM $REVISION
 
 #
-# Test rebaseline.py ...
-#
-
-REBASELINE_INPUT=tools/tests/rebaseline/input
-REBASELINE_OUTPUT=tools/tests/rebaseline/output
-rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/json1 --builders Test-Android-GalaxyNexus-SGX540-Arm7-Debug Test-Win7-ShuttleA-HD2000-x86-Release" "$REBASELINE_OUTPUT/using-json1-expectations"
-rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/json1 --bugs 1234 5678 --builders Test-Android-GalaxyNexus-SGX540-Arm7-Debug Test-Win7-ShuttleA-HD2000-x86-Release --notes notes_content --unreviewed" "$REBASELINE_OUTPUT/marked-unreviewed"
-rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/json1 --add-new --builders Test-Android-GalaxyNexus-SGX540-Arm7-Debug Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release Test-Win7-ShuttleA-HD2000-x86-Release" "$REBASELINE_OUTPUT/add-new"
-
-#
 # Test jsondiff.py ...
 #
 
 JSONDIFF_INPUT=tools/tests/jsondiff/input
 JSONDIFF_OUTPUT=tools/tests/jsondiff/output
 jsondiff_test "$JSONDIFF_INPUT/old.json $JSONDIFF_INPUT/new.json" "$JSONDIFF_OUTPUT/old-vs-new"
 
 
 #
 # Launch all the self-tests which have been written in Python.
 #
 # TODO: Over time, we should move all of our tests into Python, and delete
 # the bash tests above.
 # See https://code.google.com/p/skia/issues/detail?id=677
 # ('make tools/tests/run.sh work cross-platform')
 #
 
 COMMAND="python tools/tests/run_all.py"
 echo "$COMMAND"
 $COMMAND
 ret=$?
 if [ $ret -ne 0 ]; then
     echo "failure in Python self-tests; see stack trace above"
     exit 1
 fi
 
 
 echo "All tests passed."