rebaseline.py: error out early if --expectations-root not pointing at gm-expected dir

BUG=https://code.google.com/p/skia/issues/detail?id=1403
R=senorblanco@chromium.org

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

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

12 files changed, 58 insertions, 48 deletions

diff --git a/tools/tests/rebaseline/input/fake-gm-expected-dir/README b/tools/tests/rebaseline/input/fake-gm-expected-dir/README
new file mode 100644
index 0000000000..3958c8c97b
--- /dev/null
+++ b/tools/tests/rebaseline/input/fake-gm-expected-dir/README
@@ -0,0 +1 @@
+This directory pretends to be a checkout of gm-expected, with platform subdirs as expected.
diff --git a/tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/README b/tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/README
new file mode 100644
index 0000000000..f2ef7abeca
--- /dev/null
+++ b/tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/README
@@ -0,0 +1 @@
+pretend gm-expected directory for a single platform
diff --git a/tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/README b/tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/README
new file mode 100644
index 0000000000..f2ef7abeca
--- /dev/null
+++ b/tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/README
@@ -0,0 +1 @@
+pretend gm-expected directory for a single platform
diff --git a/tools/tests/rebaseline/output/exercise-bug1403/output-expected/command_line b/tools/tests/rebaseline/output/exercise-bug1403/output-expected/command_line
new file mode 100644
index 0000000000..2b717a5951
--- /dev/null
+++ b/tools/tests/rebaseline/output/exercise-bug1403/output-expected/command_line
@@ -0,0 +1 @@
+python tools/rebaseline.py --dry-run --expectations-root tools/tests/rebaseline/input --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
diff --git a/tools/tests/rebaseline/output/exercise-bug1403/output-expected/return_value b/tools/tests/rebaseline/output/exercise-bug1403/output-expected/return_value
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tools/tests/rebaseline/output/exercise-bug1403/output-expected/return_value
@@ -0,0 +1 @@
+1
diff --git a/tools/tests/rebaseline/output/exercise-bug1403/output-expected/stdout b/tools/tests/rebaseline/output/exercise-bug1403/output-expected/stdout
new file mode 100644
index 0000000000..5df7dd65ce
--- /dev/null
+++ b/tools/tests/rebaseline/output/exercise-bug1403/output-expected/stdout
@@ -0,0 +1,6 @@
+Traceback (most recent call last):
+  File "tools/rebaseline.py", line 288, in <module>
+    rebaseliner.RebaselineSubdir(subdir=subdir, builder=builder)
+  File "/usr/local/google/home/epoger/src/skia/white/trunk/tools/rebaseline_imagefiles.py", line 260, in RebaselineSubdir
+    'gm-expected directory?') % (subdir, self._expectations_root))
+Exception: Could not find "base-android-galaxy-nexus" subdir within expectations_root "tools/tests/rebaseline/input".  Are you sure --expectations-root is pointing at a valid gm-expected directory?
diff --git a/tools/tests/rebaseline/output/subset/output-expected/command_line b/tools/tests/rebaseline/output/subset/output-expected/command_line
index 54ad9dabeb..463a6d6b3c 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 --expectations-root fake/expectations/path --actuals-base-url file:tools/tests/rebaseline/input/json1 --tests nonexistenttest1 imageblur nonexistenttest2 --configs nonexistentconfig1 8888 nonexistentconfig2 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
+python tools/rebaseline.py --dry-run --expectations-root tools/tests/rebaseline/input/fake-gm-expected-dir --actuals-base-url file:tools/tests/rebaseline/input/json1 --tests nonexistenttest1 imageblur nonexistenttest2 --configs nonexistentconfig1 8888 nonexistentconfig2 --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 d730c69428..0ac803cbba 100644
--- a/tools/tests/rebaseline/output/subset/output-expected/stdout
+++ b/tools/tests/rebaseline/output/subset/output-expected/stdout
@@ -5,9 +5,8 @@
 #
 
 # imageblur_8888.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output base-android-galaxy-nexus/.temp-imageblur_8888.png
-mv base-android-galaxy-nexus/.temp-imageblur_8888.png base-android-galaxy-nexus/imageblur_8888.png
-Skipped these files due to test/config filters: [u'imageblur_565.png', u'shadertext3_8888.png']
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_8888.png
 
 #
 # Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/input/json1/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json ...
diff --git a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line
index 9bd9539da6..7315a3d20e 100644
--- a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line
+++ b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line
@@ -1 +1 @@
-python tools/rebaseline.py --dry-run --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new
+python tools/rebaseline.py --dry-run --expectations-root tools/tests/rebaseline/input/fake-gm-expected-dir --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new
diff --git a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout
index c6cf084187..59b2dc7d39 100644
--- a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout
+++ b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout
@@ -5,40 +5,40 @@
 #
 
 # 3x3bitmaprect_565.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png
-mv base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png base-android-galaxy-nexus/3x3bitmaprect_565.png
-svn add --quiet base-android-galaxy-nexus/3x3bitmaprect_565.png
-svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/3x3bitmaprect_565.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_565.png
+svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_565.png
+svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_565.png
 
 # 3x3bitmaprect_8888.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png
-mv base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png base-android-galaxy-nexus/3x3bitmaprect_8888.png
-svn add --quiet base-android-galaxy-nexus/3x3bitmaprect_8888.png
-svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/3x3bitmaprect_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_8888.png
+svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_8888.png
+svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/3x3bitmaprect_8888.png
 
 # imageblur_565.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/3359963596899141322.png --output base-android-galaxy-nexus/.temp-imageblur_565.png
-mv base-android-galaxy-nexus/.temp-imageblur_565.png base-android-galaxy-nexus/imageblur_565.png
-svn add --quiet base-android-galaxy-nexus/imageblur_565.png
-svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_565.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/3359963596899141322.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_565.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_565.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_565.png
+svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_565.png
+svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_565.png
 
 # imageblur_8888.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output base-android-galaxy-nexus/.temp-imageblur_8888.png
-mv base-android-galaxy-nexus/.temp-imageblur_8888.png base-android-galaxy-nexus/imageblur_8888.png
-svn add --quiet base-android-galaxy-nexus/imageblur_8888.png
-svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_8888.png
+svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_8888.png
+svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_8888.png
 
 # shadertext3_8888.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/shadertext3/3713708307125704716.png --output base-android-galaxy-nexus/.temp-shadertext3_8888.png
-mv base-android-galaxy-nexus/.temp-shadertext3_8888.png base-android-galaxy-nexus/shadertext3_8888.png
-svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png
-svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext3_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/shadertext3/3713708307125704716.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-shadertext3_8888.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-shadertext3_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/shadertext3_8888.png
+svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/shadertext3_8888.png
+svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/shadertext3_8888.png
 
 # xfermodeimagefilter_pdf.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png
-mv base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
-svn add --quiet base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
-svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
+svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
+svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/xfermodeimagefilter_pdf.png
 
 #
 # Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/input/json1/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json ...
@@ -46,19 +46,19 @@ svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/xfermodeim
 #
 
 # 3x3bitmaprect_565.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png
-mv base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png base-shuttle-win7-intel-float/3x3bitmaprect_565.png
-svn add --quiet base-shuttle-win7-intel-float/3x3bitmaprect_565.png
-svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/3x3bitmaprect_565.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_565.png
+svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_565.png
+svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_565.png
 
 # 3x3bitmaprect_8888.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png
-mv base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
-svn add --quiet base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
-svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
+svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
+svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_8888.png
 
 # xfermodeimagefilter_pdf.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png
-mv base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
-svn add --quiet base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
-svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
+svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
+svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png
diff --git a/tools/tests/rebaseline/output/using-json1/output-expected/command_line b/tools/tests/rebaseline/output/using-json1/output-expected/command_line
index 127846c872..d798943563 100644
--- a/tools/tests/rebaseline/output/using-json1/output-expected/command_line
+++ b/tools/tests/rebaseline/output/using-json1/output-expected/command_line
@@ -1 +1 @@
-python tools/rebaseline.py --dry-run --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
+python tools/rebaseline.py --dry-run --expectations-root tools/tests/rebaseline/input/fake-gm-expected-dir --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float
diff --git a/tools/tests/rebaseline/output/using-json1/output-expected/stdout b/tools/tests/rebaseline/output/using-json1/output-expected/stdout
index b3f0dbd224..e7b2906c70 100644
--- a/tools/tests/rebaseline/output/using-json1/output-expected/stdout
+++ b/tools/tests/rebaseline/output/using-json1/output-expected/stdout
@@ -5,16 +5,16 @@
 #
 
 # imageblur_565.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/3359963596899141322.png --output base-android-galaxy-nexus/.temp-imageblur_565.png
-mv base-android-galaxy-nexus/.temp-imageblur_565.png base-android-galaxy-nexus/imageblur_565.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/3359963596899141322.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_565.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_565.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_565.png
 
 # imageblur_8888.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output base-android-galaxy-nexus/.temp-imageblur_8888.png
-mv base-android-galaxy-nexus/.temp-imageblur_8888.png base-android-galaxy-nexus/imageblur_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/imageblur/4217923806027861152.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/imageblur_8888.png
 
 # shadertext3_8888.png
-curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/shadertext3/3713708307125704716.png --output base-android-galaxy-nexus/.temp-shadertext3_8888.png
-mv base-android-galaxy-nexus/.temp-shadertext3_8888.png base-android-galaxy-nexus/shadertext3_8888.png
+curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm/bitmap-64bitMD5/shadertext3/3713708307125704716.png --output tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-shadertext3_8888.png
+mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-shadertext3_8888.png tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/shadertext3_8888.png
 
 #
 # Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/input/json1/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json ...