rebaseline.py: split image-based rebaselining, which will go away soon, into its own script

(part of step 3 in https://goto.google.com/ChecksumTransitionDetail )

also adds new --expectations-root option

R=scroggo@google.com, senorblanco@chromium.org

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

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

10 files changed, 440 insertions, 306 deletions

diff --git a/tools/tests/rebaseline/input/json1/base-android-galaxy-nexus/expected-results.json b/tools/tests/rebaseline/input/json1/base-android-galaxy-nexus/expected-results.json
new file mode 100644
index 0000000000..d7608cd2a0
--- /dev/null
+++ b/tools/tests/rebaseline/input/json1/base-android-galaxy-nexus/expected-results.json
@@ -0,0 +1,52 @@
+{
+   "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/input/json1/base-macmini/expected-results.json b/tools/tests/rebaseline/input/json1/base-macmini/expected-results.json
new file mode 100644
index 0000000000..79af0cf5e7
--- /dev/null
+++ b/tools/tests/rebaseline/input/json1/base-macmini/expected-results.json
@@ -0,0 +1,26 @@
+{
+   "expected-results" : {
+      "aaclip_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 12345 ]
+         ],
+         "ignore-failure" : false
+      },
+      "aaclip_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 67890 ]
+         ],
+         "ignore-failure" : false
+      },
+      "aaclip_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 11899819492385205974 ]
+         ],
+         "ignore-failure" : false
+      },
+      "aaclip_pdf.png" : {
+         "allowed-digests" : null,
+         "ignore-failure" : false
+      }
+   }
+}
diff --git a/tools/tests/rebaseline/input/json1/base-shuttle-win7-intel-float/expected-results.json b/tools/tests/rebaseline/input/json1/base-shuttle-win7-intel-float/expected-results.json
new file mode 100644
index 0000000000..b314ed68a4
--- /dev/null
+++ b/tools/tests/rebaseline/input/json1/base-shuttle-win7-intel-float/expected-results.json
@@ -0,0 +1,52 @@
+{
+   "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/output/all/output-expected/stdout b/tools/tests/rebaseline/output/all/output-expected/stdout
index 59a1fe7935..6200102cbe 100644
--- a/tools/tests/rebaseline/output/all/output-expected/stdout
+++ b/tools/tests/rebaseline/output/all/output-expected/stdout
@@ -4,772 +4,772 @@
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-android-galaxy-nexus:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Release/base-android-nexus-10/actual-results.json
 
 # base-android-nexus-10:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-android-nexus-10:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-android-nexus-7/Test-Android-Nexus7-Tegra3-Arm7-Release/base-android-nexus-7/actual-results.json
 
 # base-android-nexus-7:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-android-nexus-7:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-android-nexus-s/Test-Android-NexusS-SGX540-Arm7-Release/base-android-nexus-s/actual-results.json
 
 # base-android-nexus-s:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-android-nexus-s:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-android-xoom/Test-Android-Xoom-Tegra2-Arm7-Release/base-android-xoom/actual-results.json
 
 # base-android-xoom:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-android-xoom:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-macmini/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/base-macmini/actual-results.json
 
 # base-macmini:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-macmini:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-macmini-lion-float/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/base-macmini-lion-float/actual-results.json
 
 # base-macmini-lion-float:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-macmini-lion-float:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-shuttle-win7-intel-angle/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/base-shuttle-win7-intel-angle/actual-results.json
 
 # base-shuttle-win7-intel-angle:
 
 # test1_angle.png
 # unable to find filename test1_angle.png in all_results dict
-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
+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
 
 # test1_anglemsaa16.png
 # unable to find filename test1_anglemsaa16.png in all_results dict
-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
+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
 
 # base-shuttle-win7-intel-angle:
 
 # test2_angle.png
 # unable to find filename test2_angle.png in all_results dict
-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
+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
 
 # test2_anglemsaa16.png
 # unable to find filename test2_anglemsaa16.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-shuttle-win7-intel-directwrite/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/base-shuttle-win7-intel-directwrite/actual-results.json
 
 # base-shuttle-win7-intel-directwrite:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-shuttle-win7-intel-directwrite:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json
 
 # base-shuttle-win7-intel-float:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-shuttle-win7-intel-float:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
 # unable to load JSON summary URL file:nonexistent-path/base-shuttle_ubuntu12_ati5770/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/base-shuttle_ubuntu12_ati5770/actual-results.json
 
 # base-shuttle_ubuntu12_ati5770:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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
 
 # test1_gpu.png
 # unable to find filename test1_gpu.png in all_results dict
-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
+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
 
 # test1_pdf.png
 # unable to find filename test1_pdf.png in all_results dict
-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
+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
 
 # test1_mesa.png
 # unable to find filename test1_mesa.png in all_results dict
-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
+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
 
 # test1_msaa16.png
 # unable to find filename test1_msaa16.png in all_results dict
-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
+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
 
 # test1_msaa4.png
 # unable to find filename test1_msaa4.png in all_results dict
-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
+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
 
 # base-shuttle_ubuntu12_ati5770:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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
 
 # test2_gpu.png
 # unable to find filename test2_gpu.png in all_results dict
-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
+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
 
 # test2_pdf.png
 # unable to find filename test2_pdf.png in all_results dict
-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
+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
 
 # test2_mesa.png
 # unable to find filename test2_mesa.png in all_results dict
-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
+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
 
 # test2_msaa16.png
 # unable to find filename test2_msaa16.png in all_results dict
-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
+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
 
 # test2_msaa4.png
 # unable to find filename test2_msaa4.png in all_results dict
-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
+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
diff --git a/tools/tests/rebaseline/output/subset/output-expected/command_line b/tools/tests/rebaseline/output/subset/output-expected/command_line
index b56f9cf2c2..ac278d2fc0 100644
--- a/tools/tests/rebaseline/output/subset/output-expected/command_line
+++ b/tools/tests/rebaseline/output/subset/output-expected/command_line
@@ -1 +1 @@
-python tools/rebaseline.py --dry-run --json-base-url file:tools/tests/rebaseline/input/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
+python tools/rebaseline.py --dry-run --expectations-root fake/expectations/path --json-base-url file:tools/tests/rebaseline/input/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
diff --git a/tools/tests/rebaseline/output/subset/output-expected/stdout b/tools/tests/rebaseline/output/subset/output-expected/stdout
index a2268e06a4..394f48eded 100644
--- a/tools/tests/rebaseline/output/subset/output-expected/stdout
+++ b/tools/tests/rebaseline/output/subset/output-expected/stdout
@@ -3,46 +3,46 @@
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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 fake/expectations/path/base-android-galaxy-nexus/.temp-test1_565.png
+mv fake/expectations/path/base-android-galaxy-nexus/.temp-test1_565.png fake/expectations/path/base-android-galaxy-nexus/test1_565.png
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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 fake/expectations/path/base-android-galaxy-nexus/.temp-test1_8888.png
+mv fake/expectations/path/base-android-galaxy-nexus/.temp-test1_8888.png fake/expectations/path/base-android-galaxy-nexus/test1_8888.png
 
 # base-android-galaxy-nexus:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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 fake/expectations/path/base-android-galaxy-nexus/.temp-test2_565.png
+mv fake/expectations/path/base-android-galaxy-nexus/.temp-test2_565.png fake/expectations/path/base-android-galaxy-nexus/test2_565.png
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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 fake/expectations/path/base-android-galaxy-nexus/.temp-test2_8888.png
+mv fake/expectations/path/base-android-galaxy-nexus/.temp-test2_8888.png fake/expectations/path/base-android-galaxy-nexus/test2_8888.png
 
 # base-shuttle-win7-intel-float:
 
 # test1_565.png
 # unable to find filename test1_565.png in all_results dict
-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
+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 fake/expectations/path/base-shuttle-win7-intel-float/.temp-test1_565.png
+mv fake/expectations/path/base-shuttle-win7-intel-float/.temp-test1_565.png fake/expectations/path/base-shuttle-win7-intel-float/test1_565.png
 
 # test1_8888.png
 # unable to find filename test1_8888.png in all_results dict
-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
+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 fake/expectations/path/base-shuttle-win7-intel-float/.temp-test1_8888.png
+mv fake/expectations/path/base-shuttle-win7-intel-float/.temp-test1_8888.png fake/expectations/path/base-shuttle-win7-intel-float/test1_8888.png
 
 # base-shuttle-win7-intel-float:
 
 # test2_565.png
 # unable to find filename test2_565.png in all_results dict
-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
+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 fake/expectations/path/base-shuttle-win7-intel-float/.temp-test2_565.png
+mv fake/expectations/path/base-shuttle-win7-intel-float/.temp-test2_565.png fake/expectations/path/base-shuttle-win7-intel-float/test2_565.png
 
 # test2_8888.png
 # unable to find filename test2_8888.png in all_results dict
-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
+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 fake/expectations/path/base-shuttle-win7-intel-float/.temp-test2_8888.png
+mv fake/expectations/path/base-shuttle-win7-intel-float/.temp-test2_8888.png fake/expectations/path/base-shuttle-win7-intel-float/test2_8888.png
diff --git a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/command_line b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/command_line
new file mode 100644
index 0000000000..9530f18c3e
--- /dev/null
+++ b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/command_line
@@ -0,0 +1 @@
+python tools/rebaseline.py --dry-run --json-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --expectations-root tools/tests/rebaseline/input/json1
diff --git a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/return_value b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/return_value
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/return_value
@@ -0,0 +1 @@
+1
diff --git a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/stdout b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/stdout
new file mode 100644
index 0000000000..43c078e65c
--- /dev/null
+++ b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/stdout
@@ -0,0 +1 @@
+ERROR: JsonRebaseliner is not implemented yet.
diff --git a/tools/tests/run.sh b/tools/tests/run.sh
index 6e6b8a51e0..2b919cb884 100755
--- a/tools/tests/run.sh
+++ b/tools/tests/run.sh
@@ -209,9 +209,10 @@ fi
 
 REBASELINE_INPUT=tools/tests/rebaseline/input
 REBASELINE_OUTPUT=tools/tests/rebaseline/output
-rebaseline_test "--json-base-url file:$REBASELINE_INPUT/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset"
+rebaseline_test "--expectations-root fake/expectations/path --json-base-url file:$REBASELINE_INPUT/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset"
 rebaseline_test "--json-base-url file:nonexistent-path --tests test1 test2" "$REBASELINE_OUTPUT/all"
 rebaseline_test "--json-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/using-json1"
 rebaseline_test "--json-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new" "$REBASELINE_OUTPUT/using-json1-add-new"
+rebaseline_test "--json-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --expectations-root $REBASELINE_INPUT/json1" "$REBASELINE_OUTPUT/using-json1-expectations"
 
 echo "All tests passed."