tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout - Issue 18416005: rebaseline.py: error out early if --expectations-root not pointing at gm-expected dir

Unified Diff: tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout

Issue 18416005: rebaseline.py: error out early if --expectations-root not pointing at gm-expected dir (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: add_test_to_exercise_bad_dir_warning Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« tools/tests/rebaseline/output/exercise-bug1403/output-expected/stdout ('K') | « tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line ('k') | tools/tests/rebaseline/output/using-json1/output-expected/command_line » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout

===================================================================

--- tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout (revision 9956)

+++ tools/tests/rebaseline/output/using-json1-add-new/output-expected/stdout (working copy)

@@ -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 @@

# 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

+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

+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