rebaseline.py : add self-tests

R=senorblanco@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9426 2bbb7eff-a529-9590-31e7-b0007b416f81

8 files changed, 857 insertions, 30 deletions

diff --git a/tools/tests/rebaseline.sh b/tools/tests/rebaseline.sh
index 0f90003613..74e846243d 100755
--- a/tools/tests/rebaseline.sh
+++ b/tools/tests/rebaseline.sh
@@ -61,20 +61,18 @@ cd $(dirname $0)
 
 ./run.sh
 SELFTEST_RESULT=$?
+TOOLS="skdiff benchgraphs rebaseline"
 echo
 if [ "$SELFTEST_RESULT" != "0" ]; then
-  WHICHTOOL=skdiff
-  replace_expected_with_actual
-  WHICHTOOL=benchgraphs
-  replace_expected_with_actual
+  for WHICHTOOL in $TOOLS; do
+    replace_expected_with_actual
+  done
   echo "Self-tests still failing, you should probably run this again..."
 else
-  WHICHTOOL=skdiff
-  svn_add_new_files
-  svn_delete_old_files
-  WHICHTOOL=benchgraphs
-  svn_add_new_files
-  svn_delete_old_files
+  for WHICHTOOL in $TOOLS; do
+    svn_add_new_files
+    svn_delete_old_files
+  done
   echo "Self-tests succeeded this time, you should be done!"
 fi
 exit $SELFTEST_RESULT
diff --git a/tools/tests/rebaseline/all/output-expected/command_line b/tools/tests/rebaseline/all/output-expected/command_line
new file mode 100644
index 0000000000..3b6c8fd1f5
--- /dev/null
+++ b/tools/tests/rebaseline/all/output-expected/command_line
@@ -0,0 +1 @@
+python tools/rebaseline.py --dry_run --tests test1 test2
diff --git a/tools/tests/rebaseline/all/output-expected/return_value b/tools/tests/rebaseline/all/output-expected/return_value
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tools/tests/rebaseline/all/output-expected/return_value
@@ -0,0 +1 @@
+0
diff --git a/tools/tests/rebaseline/all/output-expected/stdout b/tools/tests/rebaseline/all/output-expected/stdout
new file mode 100644
index 0000000000..b541982ad8
--- /dev/null
+++ b/tools/tests/rebaseline/all/output-expected/stdout
@@ -0,0 +1,742 @@
+# base-android-galaxy-nexus:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_565.png --output base-android-galaxy-nexus/.temp-test1_565.png
+mv base-android-galaxy-nexus/.temp-test1_565.png base-android-galaxy-nexus/test1_565.png
+svn add --quiet base-android-galaxy-nexus/test1_565.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_8888.png --output base-android-galaxy-nexus/.temp-test1_8888.png
+mv base-android-galaxy-nexus/.temp-test1_8888.png base-android-galaxy-nexus/test1_8888.png
+svn add --quiet base-android-galaxy-nexus/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_gpu.png --output base-android-galaxy-nexus/.temp-test1_gpu.png
+mv base-android-galaxy-nexus/.temp-test1_gpu.png base-android-galaxy-nexus/test1_gpu.png
+svn add --quiet base-android-galaxy-nexus/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_pdf.png --output base-android-galaxy-nexus/.temp-test1_pdf.png
+mv base-android-galaxy-nexus/.temp-test1_pdf.png base-android-galaxy-nexus/test1_pdf.png
+svn add --quiet base-android-galaxy-nexus/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_mesa.png --output base-android-galaxy-nexus/.temp-test1_mesa.png
+mv base-android-galaxy-nexus/.temp-test1_mesa.png base-android-galaxy-nexus/test1_mesa.png
+svn add --quiet base-android-galaxy-nexus/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_msaa16.png --output base-android-galaxy-nexus/.temp-test1_msaa16.png
+mv base-android-galaxy-nexus/.temp-test1_msaa16.png base-android-galaxy-nexus/test1_msaa16.png
+svn add --quiet base-android-galaxy-nexus/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_msaa4.png --output base-android-galaxy-nexus/.temp-test1_msaa4.png
+mv base-android-galaxy-nexus/.temp-test1_msaa4.png base-android-galaxy-nexus/test1_msaa4.png
+svn add --quiet base-android-galaxy-nexus/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_msaa4.png
+# base-android-nexus-10:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_565.png --output base-android-nexus-10/.temp-test1_565.png
+mv base-android-nexus-10/.temp-test1_565.png base-android-nexus-10/test1_565.png
+svn add --quiet base-android-nexus-10/test1_565.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_8888.png --output base-android-nexus-10/.temp-test1_8888.png
+mv base-android-nexus-10/.temp-test1_8888.png base-android-nexus-10/test1_8888.png
+svn add --quiet base-android-nexus-10/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_gpu.png --output base-android-nexus-10/.temp-test1_gpu.png
+mv base-android-nexus-10/.temp-test1_gpu.png base-android-nexus-10/test1_gpu.png
+svn add --quiet base-android-nexus-10/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_pdf.png --output base-android-nexus-10/.temp-test1_pdf.png
+mv base-android-nexus-10/.temp-test1_pdf.png base-android-nexus-10/test1_pdf.png
+svn add --quiet base-android-nexus-10/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_mesa.png --output base-android-nexus-10/.temp-test1_mesa.png
+mv base-android-nexus-10/.temp-test1_mesa.png base-android-nexus-10/test1_mesa.png
+svn add --quiet base-android-nexus-10/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_msaa16.png --output base-android-nexus-10/.temp-test1_msaa16.png
+mv base-android-nexus-10/.temp-test1_msaa16.png base-android-nexus-10/test1_msaa16.png
+svn add --quiet base-android-nexus-10/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test1_msaa4.png --output base-android-nexus-10/.temp-test1_msaa4.png
+mv base-android-nexus-10/.temp-test1_msaa4.png base-android-nexus-10/test1_msaa4.png
+svn add --quiet base-android-nexus-10/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test1_msaa4.png
+# base-android-nexus-7:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_565.png --output base-android-nexus-7/.temp-test1_565.png
+mv base-android-nexus-7/.temp-test1_565.png base-android-nexus-7/test1_565.png
+svn add --quiet base-android-nexus-7/test1_565.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_8888.png --output base-android-nexus-7/.temp-test1_8888.png
+mv base-android-nexus-7/.temp-test1_8888.png base-android-nexus-7/test1_8888.png
+svn add --quiet base-android-nexus-7/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_gpu.png --output base-android-nexus-7/.temp-test1_gpu.png
+mv base-android-nexus-7/.temp-test1_gpu.png base-android-nexus-7/test1_gpu.png
+svn add --quiet base-android-nexus-7/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_pdf.png --output base-android-nexus-7/.temp-test1_pdf.png
+mv base-android-nexus-7/.temp-test1_pdf.png base-android-nexus-7/test1_pdf.png
+svn add --quiet base-android-nexus-7/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_mesa.png --output base-android-nexus-7/.temp-test1_mesa.png
+mv base-android-nexus-7/.temp-test1_mesa.png base-android-nexus-7/test1_mesa.png
+svn add --quiet base-android-nexus-7/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_msaa16.png --output base-android-nexus-7/.temp-test1_msaa16.png
+mv base-android-nexus-7/.temp-test1_msaa16.png base-android-nexus-7/test1_msaa16.png
+svn add --quiet base-android-nexus-7/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test1_msaa4.png --output base-android-nexus-7/.temp-test1_msaa4.png
+mv base-android-nexus-7/.temp-test1_msaa4.png base-android-nexus-7/test1_msaa4.png
+svn add --quiet base-android-nexus-7/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test1_msaa4.png
+# base-android-nexus-s:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_565.png --output base-android-nexus-s/.temp-test1_565.png
+mv base-android-nexus-s/.temp-test1_565.png base-android-nexus-s/test1_565.png
+svn add --quiet base-android-nexus-s/test1_565.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_8888.png --output base-android-nexus-s/.temp-test1_8888.png
+mv base-android-nexus-s/.temp-test1_8888.png base-android-nexus-s/test1_8888.png
+svn add --quiet base-android-nexus-s/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_gpu.png --output base-android-nexus-s/.temp-test1_gpu.png
+mv base-android-nexus-s/.temp-test1_gpu.png base-android-nexus-s/test1_gpu.png
+svn add --quiet base-android-nexus-s/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_pdf.png --output base-android-nexus-s/.temp-test1_pdf.png
+mv base-android-nexus-s/.temp-test1_pdf.png base-android-nexus-s/test1_pdf.png
+svn add --quiet base-android-nexus-s/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_mesa.png --output base-android-nexus-s/.temp-test1_mesa.png
+mv base-android-nexus-s/.temp-test1_mesa.png base-android-nexus-s/test1_mesa.png
+svn add --quiet base-android-nexus-s/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_msaa16.png --output base-android-nexus-s/.temp-test1_msaa16.png
+mv base-android-nexus-s/.temp-test1_msaa16.png base-android-nexus-s/test1_msaa16.png
+svn add --quiet base-android-nexus-s/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test1_msaa4.png --output base-android-nexus-s/.temp-test1_msaa4.png
+mv base-android-nexus-s/.temp-test1_msaa4.png base-android-nexus-s/test1_msaa4.png
+svn add --quiet base-android-nexus-s/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test1_msaa4.png
+# base-android-xoom:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_565.png --output base-android-xoom/.temp-test1_565.png
+mv base-android-xoom/.temp-test1_565.png base-android-xoom/test1_565.png
+svn add --quiet base-android-xoom/test1_565.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_8888.png --output base-android-xoom/.temp-test1_8888.png
+mv base-android-xoom/.temp-test1_8888.png base-android-xoom/test1_8888.png
+svn add --quiet base-android-xoom/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_gpu.png --output base-android-xoom/.temp-test1_gpu.png
+mv base-android-xoom/.temp-test1_gpu.png base-android-xoom/test1_gpu.png
+svn add --quiet base-android-xoom/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_pdf.png --output base-android-xoom/.temp-test1_pdf.png
+mv base-android-xoom/.temp-test1_pdf.png base-android-xoom/test1_pdf.png
+svn add --quiet base-android-xoom/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_mesa.png --output base-android-xoom/.temp-test1_mesa.png
+mv base-android-xoom/.temp-test1_mesa.png base-android-xoom/test1_mesa.png
+svn add --quiet base-android-xoom/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_msaa16.png --output base-android-xoom/.temp-test1_msaa16.png
+mv base-android-xoom/.temp-test1_msaa16.png base-android-xoom/test1_msaa16.png
+svn add --quiet base-android-xoom/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test1_msaa4.png --output base-android-xoom/.temp-test1_msaa4.png
+mv base-android-xoom/.temp-test1_msaa4.png base-android-xoom/test1_msaa4.png
+svn add --quiet base-android-xoom/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test1_msaa4.png
+# base-macmini:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_565.png --output base-macmini/.temp-test1_565.png
+mv base-macmini/.temp-test1_565.png base-macmini/test1_565.png
+svn add --quiet base-macmini/test1_565.png
+svn propset --quiet svn:mime-type image/png base-macmini/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_8888.png --output base-macmini/.temp-test1_8888.png
+mv base-macmini/.temp-test1_8888.png base-macmini/test1_8888.png
+svn add --quiet base-macmini/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-macmini/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_gpu.png --output base-macmini/.temp-test1_gpu.png
+mv base-macmini/.temp-test1_gpu.png base-macmini/test1_gpu.png
+svn add --quiet base-macmini/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-macmini/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_pdf.png --output base-macmini/.temp-test1_pdf.png
+mv base-macmini/.temp-test1_pdf.png base-macmini/test1_pdf.png
+svn add --quiet base-macmini/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-macmini/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_mesa.png --output base-macmini/.temp-test1_mesa.png
+mv base-macmini/.temp-test1_mesa.png base-macmini/test1_mesa.png
+svn add --quiet base-macmini/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-macmini/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_msaa16.png --output base-macmini/.temp-test1_msaa16.png
+mv base-macmini/.temp-test1_msaa16.png base-macmini/test1_msaa16.png
+svn add --quiet base-macmini/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-macmini/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test1_msaa4.png --output base-macmini/.temp-test1_msaa4.png
+mv base-macmini/.temp-test1_msaa4.png base-macmini/test1_msaa4.png
+svn add --quiet base-macmini/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-macmini/test1_msaa4.png
+# base-macmini-lion-float:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_565.png --output base-macmini-lion-float/.temp-test1_565.png
+mv base-macmini-lion-float/.temp-test1_565.png base-macmini-lion-float/test1_565.png
+svn add --quiet base-macmini-lion-float/test1_565.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_8888.png --output base-macmini-lion-float/.temp-test1_8888.png
+mv base-macmini-lion-float/.temp-test1_8888.png base-macmini-lion-float/test1_8888.png
+svn add --quiet base-macmini-lion-float/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_gpu.png --output base-macmini-lion-float/.temp-test1_gpu.png
+mv base-macmini-lion-float/.temp-test1_gpu.png base-macmini-lion-float/test1_gpu.png
+svn add --quiet base-macmini-lion-float/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_pdf.png --output base-macmini-lion-float/.temp-test1_pdf.png
+mv base-macmini-lion-float/.temp-test1_pdf.png base-macmini-lion-float/test1_pdf.png
+svn add --quiet base-macmini-lion-float/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_mesa.png --output base-macmini-lion-float/.temp-test1_mesa.png
+mv base-macmini-lion-float/.temp-test1_mesa.png base-macmini-lion-float/test1_mesa.png
+svn add --quiet base-macmini-lion-float/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_msaa16.png --output base-macmini-lion-float/.temp-test1_msaa16.png
+mv base-macmini-lion-float/.temp-test1_msaa16.png base-macmini-lion-float/test1_msaa16.png
+svn add --quiet base-macmini-lion-float/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test1_msaa4.png --output base-macmini-lion-float/.temp-test1_msaa4.png
+mv base-macmini-lion-float/.temp-test1_msaa4.png base-macmini-lion-float/test1_msaa4.png
+svn add --quiet base-macmini-lion-float/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test1_msaa4.png
+# base-shuttle-win7-intel-angle:
+# test1_angle.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/test1_angle.png --output base-shuttle-win7-intel-angle/.temp-test1_angle.png
+mv base-shuttle-win7-intel-angle/.temp-test1_angle.png base-shuttle-win7-intel-angle/test1_angle.png
+svn add --quiet base-shuttle-win7-intel-angle/test1_angle.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-angle/test1_angle.png
+# test1_anglemsaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/test1_anglemsaa16.png --output base-shuttle-win7-intel-angle/.temp-test1_anglemsaa16.png
+mv base-shuttle-win7-intel-angle/.temp-test1_anglemsaa16.png base-shuttle-win7-intel-angle/test1_anglemsaa16.png
+svn add --quiet base-shuttle-win7-intel-angle/test1_anglemsaa16.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-angle/test1_anglemsaa16.png
+# base-shuttle-win7-intel-directwrite:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_565.png --output base-shuttle-win7-intel-directwrite/.temp-test1_565.png
+mv base-shuttle-win7-intel-directwrite/.temp-test1_565.png base-shuttle-win7-intel-directwrite/test1_565.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test1_565.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_8888.png --output base-shuttle-win7-intel-directwrite/.temp-test1_8888.png
+mv base-shuttle-win7-intel-directwrite/.temp-test1_8888.png base-shuttle-win7-intel-directwrite/test1_8888.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_gpu.png --output base-shuttle-win7-intel-directwrite/.temp-test1_gpu.png
+mv base-shuttle-win7-intel-directwrite/.temp-test1_gpu.png base-shuttle-win7-intel-directwrite/test1_gpu.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_pdf.png --output base-shuttle-win7-intel-directwrite/.temp-test1_pdf.png
+mv base-shuttle-win7-intel-directwrite/.temp-test1_pdf.png base-shuttle-win7-intel-directwrite/test1_pdf.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_mesa.png --output base-shuttle-win7-intel-directwrite/.temp-test1_mesa.png
+mv base-shuttle-win7-intel-directwrite/.temp-test1_mesa.png base-shuttle-win7-intel-directwrite/test1_mesa.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_msaa16.png --output base-shuttle-win7-intel-directwrite/.temp-test1_msaa16.png
+mv base-shuttle-win7-intel-directwrite/.temp-test1_msaa16.png base-shuttle-win7-intel-directwrite/test1_msaa16.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test1_msaa4.png --output base-shuttle-win7-intel-directwrite/.temp-test1_msaa4.png
+mv base-shuttle-win7-intel-directwrite/.temp-test1_msaa4.png base-shuttle-win7-intel-directwrite/test1_msaa4.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test1_msaa4.png
+# base-shuttle-win7-intel-float:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_565.png --output base-shuttle-win7-intel-float/.temp-test1_565.png
+mv base-shuttle-win7-intel-float/.temp-test1_565.png base-shuttle-win7-intel-float/test1_565.png
+svn add --quiet base-shuttle-win7-intel-float/test1_565.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_8888.png --output base-shuttle-win7-intel-float/.temp-test1_8888.png
+mv base-shuttle-win7-intel-float/.temp-test1_8888.png base-shuttle-win7-intel-float/test1_8888.png
+svn add --quiet base-shuttle-win7-intel-float/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_gpu.png --output base-shuttle-win7-intel-float/.temp-test1_gpu.png
+mv base-shuttle-win7-intel-float/.temp-test1_gpu.png base-shuttle-win7-intel-float/test1_gpu.png
+svn add --quiet base-shuttle-win7-intel-float/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_pdf.png --output base-shuttle-win7-intel-float/.temp-test1_pdf.png
+mv base-shuttle-win7-intel-float/.temp-test1_pdf.png base-shuttle-win7-intel-float/test1_pdf.png
+svn add --quiet base-shuttle-win7-intel-float/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_mesa.png --output base-shuttle-win7-intel-float/.temp-test1_mesa.png
+mv base-shuttle-win7-intel-float/.temp-test1_mesa.png base-shuttle-win7-intel-float/test1_mesa.png
+svn add --quiet base-shuttle-win7-intel-float/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_msaa16.png --output base-shuttle-win7-intel-float/.temp-test1_msaa16.png
+mv base-shuttle-win7-intel-float/.temp-test1_msaa16.png base-shuttle-win7-intel-float/test1_msaa16.png
+svn add --quiet base-shuttle-win7-intel-float/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_msaa4.png --output base-shuttle-win7-intel-float/.temp-test1_msaa4.png
+mv base-shuttle-win7-intel-float/.temp-test1_msaa4.png base-shuttle-win7-intel-float/test1_msaa4.png
+svn add --quiet base-shuttle-win7-intel-float/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_msaa4.png
+# base-shuttle_ubuntu12_ati5770:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_565.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_565.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test1_565.png base-shuttle_ubuntu12_ati5770/test1_565.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test1_565.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_8888.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_8888.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test1_8888.png base-shuttle_ubuntu12_ati5770/test1_8888.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_8888.png
+# test1_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_gpu.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_gpu.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test1_gpu.png base-shuttle_ubuntu12_ati5770/test1_gpu.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test1_gpu.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_gpu.png
+# test1_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_pdf.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_pdf.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test1_pdf.png base-shuttle_ubuntu12_ati5770/test1_pdf.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test1_pdf.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_pdf.png
+# test1_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_mesa.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_mesa.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test1_mesa.png base-shuttle_ubuntu12_ati5770/test1_mesa.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test1_mesa.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_mesa.png
+# test1_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_msaa16.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_msaa16.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test1_msaa16.png base-shuttle_ubuntu12_ati5770/test1_msaa16.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test1_msaa16.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_msaa16.png
+# test1_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test1_msaa4.png --output base-shuttle_ubuntu12_ati5770/.temp-test1_msaa4.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test1_msaa4.png base-shuttle_ubuntu12_ati5770/test1_msaa4.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test1_msaa4.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test1_msaa4.png
+# base-android-galaxy-nexus:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_565.png --output base-android-galaxy-nexus/.temp-test2_565.png
+mv base-android-galaxy-nexus/.temp-test2_565.png base-android-galaxy-nexus/test2_565.png
+svn add --quiet base-android-galaxy-nexus/test2_565.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_8888.png --output base-android-galaxy-nexus/.temp-test2_8888.png
+mv base-android-galaxy-nexus/.temp-test2_8888.png base-android-galaxy-nexus/test2_8888.png
+svn add --quiet base-android-galaxy-nexus/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_gpu.png --output base-android-galaxy-nexus/.temp-test2_gpu.png
+mv base-android-galaxy-nexus/.temp-test2_gpu.png base-android-galaxy-nexus/test2_gpu.png
+svn add --quiet base-android-galaxy-nexus/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_pdf.png --output base-android-galaxy-nexus/.temp-test2_pdf.png
+mv base-android-galaxy-nexus/.temp-test2_pdf.png base-android-galaxy-nexus/test2_pdf.png
+svn add --quiet base-android-galaxy-nexus/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_mesa.png --output base-android-galaxy-nexus/.temp-test2_mesa.png
+mv base-android-galaxy-nexus/.temp-test2_mesa.png base-android-galaxy-nexus/test2_mesa.png
+svn add --quiet base-android-galaxy-nexus/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_msaa16.png --output base-android-galaxy-nexus/.temp-test2_msaa16.png
+mv base-android-galaxy-nexus/.temp-test2_msaa16.png base-android-galaxy-nexus/test2_msaa16.png
+svn add --quiet base-android-galaxy-nexus/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_msaa4.png --output base-android-galaxy-nexus/.temp-test2_msaa4.png
+mv base-android-galaxy-nexus/.temp-test2_msaa4.png base-android-galaxy-nexus/test2_msaa4.png
+svn add --quiet base-android-galaxy-nexus/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_msaa4.png
+# base-android-nexus-10:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_565.png --output base-android-nexus-10/.temp-test2_565.png
+mv base-android-nexus-10/.temp-test2_565.png base-android-nexus-10/test2_565.png
+svn add --quiet base-android-nexus-10/test2_565.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_8888.png --output base-android-nexus-10/.temp-test2_8888.png
+mv base-android-nexus-10/.temp-test2_8888.png base-android-nexus-10/test2_8888.png
+svn add --quiet base-android-nexus-10/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_gpu.png --output base-android-nexus-10/.temp-test2_gpu.png
+mv base-android-nexus-10/.temp-test2_gpu.png base-android-nexus-10/test2_gpu.png
+svn add --quiet base-android-nexus-10/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_pdf.png --output base-android-nexus-10/.temp-test2_pdf.png
+mv base-android-nexus-10/.temp-test2_pdf.png base-android-nexus-10/test2_pdf.png
+svn add --quiet base-android-nexus-10/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_mesa.png --output base-android-nexus-10/.temp-test2_mesa.png
+mv base-android-nexus-10/.temp-test2_mesa.png base-android-nexus-10/test2_mesa.png
+svn add --quiet base-android-nexus-10/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_msaa16.png --output base-android-nexus-10/.temp-test2_msaa16.png
+mv base-android-nexus-10/.temp-test2_msaa16.png base-android-nexus-10/test2_msaa16.png
+svn add --quiet base-android-nexus-10/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/test2_msaa4.png --output base-android-nexus-10/.temp-test2_msaa4.png
+mv base-android-nexus-10/.temp-test2_msaa4.png base-android-nexus-10/test2_msaa4.png
+svn add --quiet base-android-nexus-10/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-10/test2_msaa4.png
+# base-android-nexus-7:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_565.png --output base-android-nexus-7/.temp-test2_565.png
+mv base-android-nexus-7/.temp-test2_565.png base-android-nexus-7/test2_565.png
+svn add --quiet base-android-nexus-7/test2_565.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_8888.png --output base-android-nexus-7/.temp-test2_8888.png
+mv base-android-nexus-7/.temp-test2_8888.png base-android-nexus-7/test2_8888.png
+svn add --quiet base-android-nexus-7/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_gpu.png --output base-android-nexus-7/.temp-test2_gpu.png
+mv base-android-nexus-7/.temp-test2_gpu.png base-android-nexus-7/test2_gpu.png
+svn add --quiet base-android-nexus-7/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_pdf.png --output base-android-nexus-7/.temp-test2_pdf.png
+mv base-android-nexus-7/.temp-test2_pdf.png base-android-nexus-7/test2_pdf.png
+svn add --quiet base-android-nexus-7/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_mesa.png --output base-android-nexus-7/.temp-test2_mesa.png
+mv base-android-nexus-7/.temp-test2_mesa.png base-android-nexus-7/test2_mesa.png
+svn add --quiet base-android-nexus-7/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_msaa16.png --output base-android-nexus-7/.temp-test2_msaa16.png
+mv base-android-nexus-7/.temp-test2_msaa16.png base-android-nexus-7/test2_msaa16.png
+svn add --quiet base-android-nexus-7/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/test2_msaa4.png --output base-android-nexus-7/.temp-test2_msaa4.png
+mv base-android-nexus-7/.temp-test2_msaa4.png base-android-nexus-7/test2_msaa4.png
+svn add --quiet base-android-nexus-7/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-7/test2_msaa4.png
+# base-android-nexus-s:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_565.png --output base-android-nexus-s/.temp-test2_565.png
+mv base-android-nexus-s/.temp-test2_565.png base-android-nexus-s/test2_565.png
+svn add --quiet base-android-nexus-s/test2_565.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_8888.png --output base-android-nexus-s/.temp-test2_8888.png
+mv base-android-nexus-s/.temp-test2_8888.png base-android-nexus-s/test2_8888.png
+svn add --quiet base-android-nexus-s/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_gpu.png --output base-android-nexus-s/.temp-test2_gpu.png
+mv base-android-nexus-s/.temp-test2_gpu.png base-android-nexus-s/test2_gpu.png
+svn add --quiet base-android-nexus-s/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_pdf.png --output base-android-nexus-s/.temp-test2_pdf.png
+mv base-android-nexus-s/.temp-test2_pdf.png base-android-nexus-s/test2_pdf.png
+svn add --quiet base-android-nexus-s/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_mesa.png --output base-android-nexus-s/.temp-test2_mesa.png
+mv base-android-nexus-s/.temp-test2_mesa.png base-android-nexus-s/test2_mesa.png
+svn add --quiet base-android-nexus-s/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_msaa16.png --output base-android-nexus-s/.temp-test2_msaa16.png
+mv base-android-nexus-s/.temp-test2_msaa16.png base-android-nexus-s/test2_msaa16.png
+svn add --quiet base-android-nexus-s/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/test2_msaa4.png --output base-android-nexus-s/.temp-test2_msaa4.png
+mv base-android-nexus-s/.temp-test2_msaa4.png base-android-nexus-s/test2_msaa4.png
+svn add --quiet base-android-nexus-s/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-nexus-s/test2_msaa4.png
+# base-android-xoom:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_565.png --output base-android-xoom/.temp-test2_565.png
+mv base-android-xoom/.temp-test2_565.png base-android-xoom/test2_565.png
+svn add --quiet base-android-xoom/test2_565.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_8888.png --output base-android-xoom/.temp-test2_8888.png
+mv base-android-xoom/.temp-test2_8888.png base-android-xoom/test2_8888.png
+svn add --quiet base-android-xoom/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_gpu.png --output base-android-xoom/.temp-test2_gpu.png
+mv base-android-xoom/.temp-test2_gpu.png base-android-xoom/test2_gpu.png
+svn add --quiet base-android-xoom/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_pdf.png --output base-android-xoom/.temp-test2_pdf.png
+mv base-android-xoom/.temp-test2_pdf.png base-android-xoom/test2_pdf.png
+svn add --quiet base-android-xoom/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_mesa.png --output base-android-xoom/.temp-test2_mesa.png
+mv base-android-xoom/.temp-test2_mesa.png base-android-xoom/test2_mesa.png
+svn add --quiet base-android-xoom/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_msaa16.png --output base-android-xoom/.temp-test2_msaa16.png
+mv base-android-xoom/.temp-test2_msaa16.png base-android-xoom/test2_msaa16.png
+svn add --quiet base-android-xoom/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/test2_msaa4.png --output base-android-xoom/.temp-test2_msaa4.png
+mv base-android-xoom/.temp-test2_msaa4.png base-android-xoom/test2_msaa4.png
+svn add --quiet base-android-xoom/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-android-xoom/test2_msaa4.png
+# base-macmini:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_565.png --output base-macmini/.temp-test2_565.png
+mv base-macmini/.temp-test2_565.png base-macmini/test2_565.png
+svn add --quiet base-macmini/test2_565.png
+svn propset --quiet svn:mime-type image/png base-macmini/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_8888.png --output base-macmini/.temp-test2_8888.png
+mv base-macmini/.temp-test2_8888.png base-macmini/test2_8888.png
+svn add --quiet base-macmini/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-macmini/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_gpu.png --output base-macmini/.temp-test2_gpu.png
+mv base-macmini/.temp-test2_gpu.png base-macmini/test2_gpu.png
+svn add --quiet base-macmini/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-macmini/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_pdf.png --output base-macmini/.temp-test2_pdf.png
+mv base-macmini/.temp-test2_pdf.png base-macmini/test2_pdf.png
+svn add --quiet base-macmini/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-macmini/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_mesa.png --output base-macmini/.temp-test2_mesa.png
+mv base-macmini/.temp-test2_mesa.png base-macmini/test2_mesa.png
+svn add --quiet base-macmini/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-macmini/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_msaa16.png --output base-macmini/.temp-test2_msaa16.png
+mv base-macmini/.temp-test2_msaa16.png base-macmini/test2_msaa16.png
+svn add --quiet base-macmini/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-macmini/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/test2_msaa4.png --output base-macmini/.temp-test2_msaa4.png
+mv base-macmini/.temp-test2_msaa4.png base-macmini/test2_msaa4.png
+svn add --quiet base-macmini/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-macmini/test2_msaa4.png
+# base-macmini-lion-float:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_565.png --output base-macmini-lion-float/.temp-test2_565.png
+mv base-macmini-lion-float/.temp-test2_565.png base-macmini-lion-float/test2_565.png
+svn add --quiet base-macmini-lion-float/test2_565.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_8888.png --output base-macmini-lion-float/.temp-test2_8888.png
+mv base-macmini-lion-float/.temp-test2_8888.png base-macmini-lion-float/test2_8888.png
+svn add --quiet base-macmini-lion-float/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_gpu.png --output base-macmini-lion-float/.temp-test2_gpu.png
+mv base-macmini-lion-float/.temp-test2_gpu.png base-macmini-lion-float/test2_gpu.png
+svn add --quiet base-macmini-lion-float/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_pdf.png --output base-macmini-lion-float/.temp-test2_pdf.png
+mv base-macmini-lion-float/.temp-test2_pdf.png base-macmini-lion-float/test2_pdf.png
+svn add --quiet base-macmini-lion-float/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_mesa.png --output base-macmini-lion-float/.temp-test2_mesa.png
+mv base-macmini-lion-float/.temp-test2_mesa.png base-macmini-lion-float/test2_mesa.png
+svn add --quiet base-macmini-lion-float/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_msaa16.png --output base-macmini-lion-float/.temp-test2_msaa16.png
+mv base-macmini-lion-float/.temp-test2_msaa16.png base-macmini-lion-float/test2_msaa16.png
+svn add --quiet base-macmini-lion-float/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/test2_msaa4.png --output base-macmini-lion-float/.temp-test2_msaa4.png
+mv base-macmini-lion-float/.temp-test2_msaa4.png base-macmini-lion-float/test2_msaa4.png
+svn add --quiet base-macmini-lion-float/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-macmini-lion-float/test2_msaa4.png
+# base-shuttle-win7-intel-angle:
+# test2_angle.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/test2_angle.png --output base-shuttle-win7-intel-angle/.temp-test2_angle.png
+mv base-shuttle-win7-intel-angle/.temp-test2_angle.png base-shuttle-win7-intel-angle/test2_angle.png
+svn add --quiet base-shuttle-win7-intel-angle/test2_angle.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-angle/test2_angle.png
+# test2_anglemsaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/test2_anglemsaa16.png --output base-shuttle-win7-intel-angle/.temp-test2_anglemsaa16.png
+mv base-shuttle-win7-intel-angle/.temp-test2_anglemsaa16.png base-shuttle-win7-intel-angle/test2_anglemsaa16.png
+svn add --quiet base-shuttle-win7-intel-angle/test2_anglemsaa16.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-angle/test2_anglemsaa16.png
+# base-shuttle-win7-intel-directwrite:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_565.png --output base-shuttle-win7-intel-directwrite/.temp-test2_565.png
+mv base-shuttle-win7-intel-directwrite/.temp-test2_565.png base-shuttle-win7-intel-directwrite/test2_565.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test2_565.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_8888.png --output base-shuttle-win7-intel-directwrite/.temp-test2_8888.png
+mv base-shuttle-win7-intel-directwrite/.temp-test2_8888.png base-shuttle-win7-intel-directwrite/test2_8888.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_gpu.png --output base-shuttle-win7-intel-directwrite/.temp-test2_gpu.png
+mv base-shuttle-win7-intel-directwrite/.temp-test2_gpu.png base-shuttle-win7-intel-directwrite/test2_gpu.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_pdf.png --output base-shuttle-win7-intel-directwrite/.temp-test2_pdf.png
+mv base-shuttle-win7-intel-directwrite/.temp-test2_pdf.png base-shuttle-win7-intel-directwrite/test2_pdf.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_mesa.png --output base-shuttle-win7-intel-directwrite/.temp-test2_mesa.png
+mv base-shuttle-win7-intel-directwrite/.temp-test2_mesa.png base-shuttle-win7-intel-directwrite/test2_mesa.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_msaa16.png --output base-shuttle-win7-intel-directwrite/.temp-test2_msaa16.png
+mv base-shuttle-win7-intel-directwrite/.temp-test2_msaa16.png base-shuttle-win7-intel-directwrite/test2_msaa16.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/test2_msaa4.png --output base-shuttle-win7-intel-directwrite/.temp-test2_msaa4.png
+mv base-shuttle-win7-intel-directwrite/.temp-test2_msaa4.png base-shuttle-win7-intel-directwrite/test2_msaa4.png
+svn add --quiet base-shuttle-win7-intel-directwrite/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-directwrite/test2_msaa4.png
+# base-shuttle-win7-intel-float:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_565.png --output base-shuttle-win7-intel-float/.temp-test2_565.png
+mv base-shuttle-win7-intel-float/.temp-test2_565.png base-shuttle-win7-intel-float/test2_565.png
+svn add --quiet base-shuttle-win7-intel-float/test2_565.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_8888.png --output base-shuttle-win7-intel-float/.temp-test2_8888.png
+mv base-shuttle-win7-intel-float/.temp-test2_8888.png base-shuttle-win7-intel-float/test2_8888.png
+svn add --quiet base-shuttle-win7-intel-float/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_gpu.png --output base-shuttle-win7-intel-float/.temp-test2_gpu.png
+mv base-shuttle-win7-intel-float/.temp-test2_gpu.png base-shuttle-win7-intel-float/test2_gpu.png
+svn add --quiet base-shuttle-win7-intel-float/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_pdf.png --output base-shuttle-win7-intel-float/.temp-test2_pdf.png
+mv base-shuttle-win7-intel-float/.temp-test2_pdf.png base-shuttle-win7-intel-float/test2_pdf.png
+svn add --quiet base-shuttle-win7-intel-float/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_mesa.png --output base-shuttle-win7-intel-float/.temp-test2_mesa.png
+mv base-shuttle-win7-intel-float/.temp-test2_mesa.png base-shuttle-win7-intel-float/test2_mesa.png
+svn add --quiet base-shuttle-win7-intel-float/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_msaa16.png --output base-shuttle-win7-intel-float/.temp-test2_msaa16.png
+mv base-shuttle-win7-intel-float/.temp-test2_msaa16.png base-shuttle-win7-intel-float/test2_msaa16.png
+svn add --quiet base-shuttle-win7-intel-float/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_msaa4.png --output base-shuttle-win7-intel-float/.temp-test2_msaa4.png
+mv base-shuttle-win7-intel-float/.temp-test2_msaa4.png base-shuttle-win7-intel-float/test2_msaa4.png
+svn add --quiet base-shuttle-win7-intel-float/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_msaa4.png
+# base-shuttle_ubuntu12_ati5770:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_565.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_565.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test2_565.png base-shuttle_ubuntu12_ati5770/test2_565.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test2_565.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_8888.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_8888.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test2_8888.png base-shuttle_ubuntu12_ati5770/test2_8888.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_8888.png
+# test2_gpu.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_gpu.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_gpu.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test2_gpu.png base-shuttle_ubuntu12_ati5770/test2_gpu.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test2_gpu.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_gpu.png
+# test2_pdf.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_pdf.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_pdf.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test2_pdf.png base-shuttle_ubuntu12_ati5770/test2_pdf.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test2_pdf.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_pdf.png
+# test2_mesa.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_mesa.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_mesa.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test2_mesa.png base-shuttle_ubuntu12_ati5770/test2_mesa.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test2_mesa.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_mesa.png
+# test2_msaa16.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_msaa16.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_msaa16.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test2_msaa16.png base-shuttle_ubuntu12_ati5770/test2_msaa16.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test2_msaa16.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_msaa16.png
+# test2_msaa4.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/test2_msaa4.png --output base-shuttle_ubuntu12_ati5770/.temp-test2_msaa4.png
+mv base-shuttle_ubuntu12_ati5770/.temp-test2_msaa4.png base-shuttle_ubuntu12_ati5770/test2_msaa4.png
+svn add --quiet base-shuttle_ubuntu12_ati5770/test2_msaa4.png
+svn propset --quiet svn:mime-type image/png base-shuttle_ubuntu12_ati5770/test2_msaa4.png
diff --git a/tools/tests/rebaseline/subset/output-expected/command_line b/tools/tests/rebaseline/subset/output-expected/command_line
new file mode 100644
index 0000000000..b71d705bc2
--- /dev/null
+++ b/tools/tests/rebaseline/subset/output-expected/command_line
@@ -0,0 +1 @@
+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/subset/output-expected/return_value b/tools/tests/rebaseline/subset/output-expected/return_value
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tools/tests/rebaseline/subset/output-expected/return_value
@@ -0,0 +1 @@
+0
diff --git a/tools/tests/rebaseline/subset/output-expected/stdout b/tools/tests/rebaseline/subset/output-expected/stdout
new file mode 100644
index 0000000000..087d40f69c
--- /dev/null
+++ b/tools/tests/rebaseline/subset/output-expected/stdout
@@ -0,0 +1,44 @@
+# base-android-galaxy-nexus:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_565.png --output base-android-galaxy-nexus/.temp-test1_565.png
+mv base-android-galaxy-nexus/.temp-test1_565.png base-android-galaxy-nexus/test1_565.png
+svn add --quiet base-android-galaxy-nexus/test1_565.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test1_8888.png --output base-android-galaxy-nexus/.temp-test1_8888.png
+mv base-android-galaxy-nexus/.temp-test1_8888.png base-android-galaxy-nexus/test1_8888.png
+svn add --quiet base-android-galaxy-nexus/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test1_8888.png
+# base-shuttle-win7-intel-float:
+# test1_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_565.png --output base-shuttle-win7-intel-float/.temp-test1_565.png
+mv base-shuttle-win7-intel-float/.temp-test1_565.png base-shuttle-win7-intel-float/test1_565.png
+svn add --quiet base-shuttle-win7-intel-float/test1_565.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_565.png
+# test1_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test1_8888.png --output base-shuttle-win7-intel-float/.temp-test1_8888.png
+mv base-shuttle-win7-intel-float/.temp-test1_8888.png base-shuttle-win7-intel-float/test1_8888.png
+svn add --quiet base-shuttle-win7-intel-float/test1_8888.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test1_8888.png
+# base-android-galaxy-nexus:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_565.png --output base-android-galaxy-nexus/.temp-test2_565.png
+mv base-android-galaxy-nexus/.temp-test2_565.png base-android-galaxy-nexus/test2_565.png
+svn add --quiet base-android-galaxy-nexus/test2_565.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/test2_8888.png --output base-android-galaxy-nexus/.temp-test2_8888.png
+mv base-android-galaxy-nexus/.temp-test2_8888.png base-android-galaxy-nexus/test2_8888.png
+svn add --quiet base-android-galaxy-nexus/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/test2_8888.png
+# base-shuttle-win7-intel-float:
+# test2_565.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_565.png --output base-shuttle-win7-intel-float/.temp-test2_565.png
+mv base-shuttle-win7-intel-float/.temp-test2_565.png base-shuttle-win7-intel-float/test2_565.png
+svn add --quiet base-shuttle-win7-intel-float/test2_565.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_565.png
+# test2_8888.png
+curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/test2_8888.png --output base-shuttle-win7-intel-float/.temp-test2_8888.png
+mv base-shuttle-win7-intel-float/.temp-test2_8888.png base-shuttle-win7-intel-float/test2_8888.png
+svn add --quiet base-shuttle-win7-intel-float/test2_8888.png
+svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/test2_8888.png
diff --git a/tools/tests/run.sh b/tools/tests/run.sh
index 30a7882e5d..8969c81b65 100755
--- a/tools/tests/run.sh
+++ b/tools/tests/run.sh
@@ -68,26 +68,6 @@ function skdiff_test {
   compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
 }
 
-SKDIFF_TESTDIR=tools/tests/skdiff
-
-# Run skdiff over a variety of file pair types: identical bits, identical pixels, missing from
-# baseDir, etc.
-skdiff_test "$SKDIFF_TESTDIR/baseDir $SKDIFF_TESTDIR/comparisonDir" "$SKDIFF_TESTDIR/test1"
-
-# Run skdiff over the same set of files, but with arguments as used by our buildbots:
-# - return the number of mismatching file pairs (but ignore any files missing from either
-#   baseDir or comparisonDir)
-# - list filenames with each result type to stdout
-# - don't generate HTML output files
-skdiff_test "--failonresult DifferentPixels --failonresult DifferentSizes --failonresult Unknown --failonstatus CouldNotDecode,CouldNotRead any --failonstatus any CouldNotDecode,CouldNotRead --listfilenames --nodiffs $SKDIFF_TESTDIR/baseDir $SKDIFF_TESTDIR/comparisonDir" "$SKDIFF_TESTDIR/test2"
-
-# Run skdiff over just the files that have identical bits.
-skdiff_test "--nodiffs --match identical-bits $SKDIFF_TESTDIR/baseDir $SKDIFF_TESTDIR/comparisonDir" "$SKDIFF_TESTDIR/identical-bits"
-
-# Run skdiff over just the files that have identical bits or identical pixels.
-skdiff_test "--nodiffs --match identical-bits --match identical-pixels $SKDIFF_TESTDIR/baseDir $SKDIFF_TESTDIR/comparisonDir" "$SKDIFF_TESTDIR/identical-bits-or-pixels"
-
-
 # Download a subset of the raw bench data for platform $1 at revision $2.
 # (For the subset, download all files matching any of the suffixes in
 # whitespace-separated list $3.)
@@ -149,6 +129,56 @@ 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.
+function rebaseline_test {
+  if [ $# != 2 ]; then
+    echo "rebaseline_test requires exactly 2 parameters, got $#"
+    exit 1
+  fi
+  ARGS="$1"
+  ACTUAL_OUTPUT_DIR="$2/output-actual"
+  EXPECTED_OUTPUT_DIR="$2/output-expected"
+
+  rm -rf $ACTUAL_OUTPUT_DIR
+  mkdir -p $ACTUAL_OUTPUT_DIR
+  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
+
+  compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
+}
+
+
+
+#
+# Run skdiff tests...
+#
+
+SKDIFF_TESTDIR=tools/tests/skdiff
+
+# Run skdiff over a variety of file pair types: identical bits, identical pixels, missing from
+# baseDir, etc.
+skdiff_test "$SKDIFF_TESTDIR/baseDir $SKDIFF_TESTDIR/comparisonDir" "$SKDIFF_TESTDIR/test1"
+
+# Run skdiff over the same set of files, but with arguments as used by our buildbots:
+# - return the number of mismatching file pairs (but ignore any files missing from either
+#   baseDir or comparisonDir)
+# - list filenames with each result type to stdout
+# - don't generate HTML output files
+skdiff_test "--failonresult DifferentPixels --failonresult DifferentSizes --failonresult Unknown --failonstatus CouldNotDecode,CouldNotRead any --failonstatus any CouldNotDecode,CouldNotRead --listfilenames --nodiffs $SKDIFF_TESTDIR/baseDir $SKDIFF_TESTDIR/comparisonDir" "$SKDIFF_TESTDIR/test2"
+
+# Run skdiff over just the files that have identical bits.
+skdiff_test "--nodiffs --match identical-bits $SKDIFF_TESTDIR/baseDir $SKDIFF_TESTDIR/comparisonDir" "$SKDIFF_TESTDIR/identical-bits"
+
+# Run skdiff over just the files that have identical bits or identical pixels.
+skdiff_test "--nodiffs --match identical-bits --match identical-pixels $SKDIFF_TESTDIR/baseDir $SKDIFF_TESTDIR/comparisonDir" "$SKDIFF_TESTDIR/identical-bits-or-pixels"
+
+#
+# Run benchgraph tests...
+#
+
 # Parse a collection of bench data leading up to
 # http://70.32.156.53:10117/builders/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/builds/878/steps/GenerateWebpagePictureBenchGraphs/logs/stdio
 # (this was during the period when the bench data included a ton of per-tile,
@@ -160,4 +190,13 @@ benchgraph_download_rawdata $PLATFORM 7679 "$BENCHDATA_FILE_SUFFIXES_YES_INDIVID
 benchgraph_download_rawdata $PLATFORM 7686 "$BENCHDATA_FILE_SUFFIXES_YES_INDIVIDUAL_TILES"
 benchgraph_test $PLATFORM
 
+#
+# Test rebaseline.py ...
+#
+
+REBASELINE_TESTDIR=tools/tests/rebaseline
+rebaseline_test "--tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_TESTDIR/subset"
+rebaseline_test "--tests test1 test2" "$REBASELINE_TESTDIR/all"
+
+
 echo "All tests passed."