rebaseline.py: if --tests is not specified, get test list from actual-results.json

R=scroggo@google.com

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

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

8 files changed, 507 insertions, 346 deletions

diff --git a/tools/tests/rebaseline/all/output-expected/stdout b/tools/tests/rebaseline/all/output-expected/stdout
index b541982ad8..dc83c70ac7 100644
--- a/tools/tests/rebaseline/all/output-expected/stdout
+++ b/tools/tests/rebaseline/all/output-expected/stdout
@@ -34,341 +34,6 @@ curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro
 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
@@ -406,6 +71,42 @@ mv base-android-galaxy-nexus/.temp-test2_msaa4.png base-android-galaxy-nexus/tes
 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:
+# 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-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
@@ -442,6 +143,42 @@ mv base-android-nexus-10/.temp-test2_msaa4.png base-android-nexus-10/test2_msaa4
 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:
+# 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-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
@@ -478,6 +215,42 @@ mv base-android-nexus-7/.temp-test2_msaa4.png base-android-nexus-7/test2_msaa4.p
 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:
+# 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-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
@@ -514,6 +287,42 @@ mv base-android-nexus-s/.temp-test2_msaa4.png base-android-nexus-s/test2_msaa4.p
 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:
+# 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-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
@@ -550,6 +359,42 @@ 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:
+# 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:
 # 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
@@ -586,6 +431,42 @@ 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:
+# 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-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
@@ -622,6 +503,17 @@ mv base-macmini-lion-float/.temp-test2_msaa4.png base-macmini-lion-float/test2_m
 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:
+# 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-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
@@ -633,6 +525,42 @@ mv base-shuttle-win7-intel-angle/.temp-test2_anglemsaa16.png base-shuttle-win7-i
 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:
+# 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-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
@@ -669,6 +597,42 @@ mv base-shuttle-win7-intel-directwrite/.temp-test2_msaa4.png base-shuttle-win7-i
 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:
+# 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-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
@@ -705,6 +669,42 @@ mv base-shuttle-win7-intel-float/.temp-test2_msaa4.png base-shuttle-win7-intel-f
 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:
+# 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-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
diff --git a/tools/tests/rebaseline/subset/output-expected/stdout b/tools/tests/rebaseline/subset/output-expected/stdout
index 087d40f69c..24b0d231d0 100644
--- a/tools/tests/rebaseline/subset/output-expected/stdout
+++ b/tools/tests/rebaseline/subset/output-expected/stdout
@@ -9,17 +9,6 @@ curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro
 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
@@ -32,6 +21,17 @@ mv base-android-galaxy-nexus/.temp-test2_8888.png base-android-galaxy-nexus/test
 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:
+# 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-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
diff --git a/tools/tests/rebaseline/using-json/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/actual-results.json b/tools/tests/rebaseline/using-json/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/actual-results.json
new file mode 100644
index 0000000000..ea3ff77056
--- /dev/null
+++ b/tools/tests/rebaseline/using-json/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/actual-results.json
@@ -0,0 +1,70 @@
+{
+   "actual-results" : {
+      "failed" : {
+         "imageblur_565.png" : [ "bitmap-64bitMD5", 3359963596899141322 ],
+         "imageblur_8888.png" : [ "bitmap-64bitMD5", 4217923806027861152 ],
+         "shadertext3_8888.png" : [ "bitmap-64bitMD5", 3713708307125704716 ]
+       },
+      "failure-ignored" : null,
+      "no-comparison" : {
+         "3x3bitmaprect_565.png" : [ "bitmap-64bitMD5", 16998423976396106083 ],
+         "3x3bitmaprect_8888.png" : [ "bitmap-64bitMD5", 2054956815327187963 ],
+         "xfermodeimagefilter_pdf.png" : [ "bitmap-64bitMD5", 16502178848783208088 ]
+      },
+      "succeeded" : {
+         "aaclip_gpu.png" : [ "bitmap-64bitMD5", 11899819492385205974 ],
+         "aarectmodes_565.png" : [ "bitmap-64bitMD5", 14760033689012826769 ],
+         "xfermodes_pdf.png" : [ "bitmap-64bitMD5", 9151974350149210736 ]
+      }
+   },
+   "expected-results" : {
+      "3x3bitmaprect_565.png" : {
+         "allowed-digests" : null,
+         "ignore-failure" : false
+      },
+      "3x3bitmaprect_8888.png" : {
+         "allowed-digests" : null,
+         "ignore-failure" : false
+      },
+      "aaclip_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 11899819492385205974 ]
+         ],
+         "ignore-failure" : false
+      },
+      "aarectmodes_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 14760033689012826769 ]
+         ],
+         "ignore-failure" : false
+      },
+      "imageblur_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 17796243856503591523 ]
+         ],
+         "ignore-failure" : false
+      },
+      "imageblur_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 7426416989687670152 ]
+         ],
+         "ignore-failure" : false
+      },
+      "shadertext3_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 10593797161686785561 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_pdf.png" : {
+         "allowed-digests" : null,
+         "ignore-failure" : false
+      },
+      "xfermodes_pdf.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 9151974350149210736 ]
+         ],
+         "ignore-failure" : false
+      }
+   }
+}
diff --git a/tools/tests/rebaseline/using-json/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json b/tools/tests/rebaseline/using-json/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json
new file mode 100644
index 0000000000..c7aa04cc68
--- /dev/null
+++ b/tools/tests/rebaseline/using-json/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json
@@ -0,0 +1,69 @@
+{
+   "actual-results" : {
+      "failed" : null,
+      "failure-ignored" : null,
+      "no-comparison" : {
+         "3x3bitmaprect_565.png" : [ "bitmap-64bitMD5", 16998423976396106083 ],
+         "3x3bitmaprect_8888.png" : [ "bitmap-64bitMD5", 2054956815327187963 ],
+         "xfermodeimagefilter_pdf.png" : [ "bitmap-64bitMD5", 16502178848783208088 ]
+      },
+      "succeeded" : {
+         "aaclip_gpu.png" : [ "bitmap-64bitMD5", 11899819492385205974 ],
+         "aarectmodes_565.png" : [ "bitmap-64bitMD5", 14760033689012826769 ],
+         "imageblur_565.png" : [ "bitmap-64bitMD5", 3359963596899141322 ],
+         "imageblur_8888.png" : [ "bitmap-64bitMD5", 4217923806027861152 ],
+         "shadertext3_8888.png" : [ "bitmap-64bitMD5", 3713708307125704716 ],
+         "xfermodes_pdf.png" : [ "bitmap-64bitMD5", 9151974350149210736 ]
+      }
+   },
+   "expected-results" : {
+      "3x3bitmaprect_565.png" : {
+         "allowed-digests" : null,
+         "ignore-failure" : false
+      },
+      "3x3bitmaprect_8888.png" : {
+         "allowed-digests" : null,
+         "ignore-failure" : false
+      },
+      "aaclip_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 11899819492385205974 ]
+         ],
+         "ignore-failure" : false
+      },
+      "aarectmodes_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 14760033689012826769 ]
+         ],
+         "ignore-failure" : false
+      },
+      "imageblur_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 3359963596899141322 ]
+         ],
+         "ignore-failure" : false
+      },
+      "imageblur_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 4217923806027861152 ]
+         ],
+         "ignore-failure" : false
+      },
+      "shadertext3_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 3713708307125704716 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_pdf.png" : {
+         "allowed-digests" : null,
+         "ignore-failure" : false
+      },
+      "xfermodes_pdf.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 9151974350149210736 ]
+         ],
+         "ignore-failure" : false
+      }
+   }
+}
diff --git a/tools/tests/rebaseline/using-json/output-expected/command_line b/tools/tests/rebaseline/using-json/output-expected/command_line
new file mode 100644
index 0000000000..c96194641f
--- /dev/null
+++ b/tools/tests/rebaseline/using-json/output-expected/command_line
@@ -0,0 +1 @@
+python tools/rebaseline.py --dry_run --json_base_url file:tools/tests/rebaseline/using-json --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
diff --git a/tools/tests/rebaseline/using-json/output-expected/return_value b/tools/tests/rebaseline/using-json/output-expected/return_value
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tools/tests/rebaseline/using-json/output-expected/return_value
@@ -0,0 +1 @@
+0
diff --git a/tools/tests/rebaseline/using-json/output-expected/stdout b/tools/tests/rebaseline/using-json/output-expected/stdout
new file mode 100644
index 0000000000..58814e0bbb
--- /dev/null
+++ b/tools/tests/rebaseline/using-json/output-expected/stdout
@@ -0,0 +1,19 @@
+# Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/using-json/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/actual-results.json ...
+# ... found files_to_rebaseline [u'imageblur_565.png', u'imageblur_8888.png', u'shadertext3_8888.png']
+# imageblur_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/imageblur_565.png --output base-android-galaxy-nexus/.temp-imageblur_565.png
+mv base-android-galaxy-nexus/.temp-imageblur_565.png base-android-galaxy-nexus/imageblur_565.png
+svn add --quiet base-android-galaxy-nexus/imageblur_565.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_565.png
+# imageblur_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/imageblur_8888.png --output base-android-galaxy-nexus/.temp-imageblur_8888.png
+mv base-android-galaxy-nexus/.temp-imageblur_8888.png base-android-galaxy-nexus/imageblur_8888.png
+svn add --quiet base-android-galaxy-nexus/imageblur_8888.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_8888.png
+# shadertext3_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/shadertext3_8888.png --output base-android-galaxy-nexus/.temp-shadertext3_8888.png
+mv base-android-galaxy-nexus/.temp-shadertext3_8888.png base-android-galaxy-nexus/shadertext3_8888.png
+svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png
+svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext3_8888.png
+# Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/using-json/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json ...
+# ... found files_to_rebaseline []
diff --git a/tools/tests/run.sh b/tools/tests/run.sh
index 8969c81b65..af1a35a629 100755
--- a/tools/tests/run.sh
+++ b/tools/tests/run.sh
@@ -197,6 +197,7 @@ benchgraph_test $PLATFORM
 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"
+rebaseline_test "--json_base_url file:$REBASELINE_TESTDIR/using-json --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_TESTDIR/using-json"
 
 
 echo "All tests passed."