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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log

« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1	1

2 #	2 #

3 # Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/ input/json1/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug /base-android-galaxy-nexus/actual-results.json ...	3 # Getting files to rebaseline from JSON summary URL file:tools/tests/rebaseline/ input/json1/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug /base-android-galaxy-nexus/actual-results.json ...

4 # ... found files_to_rebaseline [u'3x3bitmaprect_565.png', u'3x3bitmaprect_8888. png', u'imageblur_565.png', u'imageblur_8888.png', u'shadertext3_8888.png', u'xf ermodeimagefilter_pdf.png']	4 # ... found files_to_rebaseline [u'3x3bitmaprect_565.png', u'3x3bitmaprect_8888. png', u'imageblur_565.png', u'imageblur_8888.png', u'shadertext3_8888.png', u'xf ermodeimagefilter_pdf.png']

5 #	5 #

6	6

7 # 3x3bitmaprect_565.png	7 # 3x3bitmaprect_565.png

8 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output base-android-ga laxy-nexus/.temp-3x3bitmaprect_565.png	8 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output tools/tests/reb aseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect _565.png

9 mv base-android-galaxy-nexus/.temp-3x3bitmaprect_565.png base-android-galaxy-nex us/3x3bitmaprect_565.png	9 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/bas e-android-galaxy-nexus/3x3bitmaprect_565.png

10 svn add --quiet base-android-galaxy-nexus/3x3bitmaprect_565.png	10 svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-g alaxy-nexus/3x3bitmaprect_565.png

11 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/3x3bitmapr ect_565.png	11 svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm -expected-dir/base-android-galaxy-nexus/3x3bitmaprect_565.png

12	12

13 # 3x3bitmaprect_8888.png	13 # 3x3bitmaprect_8888.png

14 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output base-android-gal axy-nexus/.temp-3x3bitmaprect_8888.png	14 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output tools/tests/reba seline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-3x3bitmaprect_ 8888.png

15 mv base-android-galaxy-nexus/.temp-3x3bitmaprect_8888.png base-android-galaxy-ne xus/3x3bitmaprect_8888.png	15 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/ba se-android-galaxy-nexus/3x3bitmaprect_8888.png

16 svn add --quiet base-android-galaxy-nexus/3x3bitmaprect_8888.png	16 svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-g alaxy-nexus/3x3bitmaprect_8888.png

17 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/3x3bitmapr ect_8888.png	17 svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm -expected-dir/base-android-galaxy-nexus/3x3bitmaprect_8888.png

18	18

19 # imageblur_565.png	19 # imageblur_565.png

20 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	20 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/imageblur/3359963596899141322.png --output tools/tests/rebaseli ne/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_565.png

21 mv base-android-galaxy-nexus/.temp-imageblur_565.png base-android-galaxy-nexus/i mageblur_565.png	21 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-an droid-galaxy-nexus/imageblur_565.png

22 svn add --quiet base-android-galaxy-nexus/imageblur_565.png	22 svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-g alaxy-nexus/imageblur_565.png

23 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 565.png	23 svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm -expected-dir/base-android-galaxy-nexus/imageblur_565.png

24	24

25 # imageblur_8888.png	25 # imageblur_8888.png

26 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	26 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/imageblur/4217923806027861152.png --output tools/tests/rebaseli ne/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-imageblur_8888.png

27 mv base-android-galaxy-nexus/.temp-imageblur_8888.png base-android-galaxy-nexus/ imageblur_8888.png	27 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-a ndroid-galaxy-nexus/imageblur_8888.png

28 svn add --quiet base-android-galaxy-nexus/imageblur_8888.png	28 svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-g alaxy-nexus/imageblur_8888.png

29 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 8888.png	29 svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm -expected-dir/base-android-galaxy-nexus/imageblur_8888.png

30	30

31 # shadertext3_8888.png	31 # shadertext3_8888.png

32 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/shadertext3/3713708307125704716.png --output base-android-galax y-nexus/.temp-shadertext3_8888.png	32 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/shadertext3/3713708307125704716.png --output tools/tests/rebase line/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-shadertext3_8888 .png

33 mv base-android-galaxy-nexus/.temp-shadertext3_8888.png base-android-galaxy-nexu s/shadertext3_8888.png	33 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

34 svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png	34 svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-g alaxy-nexus/shadertext3_8888.png

35 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext 3_8888.png	35 svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm -expected-dir/base-android-galaxy-nexus/shadertext3_8888.png

36	36

37 # xfermodeimagefilter_pdf.png	37 # xfermodeimagefilter_pdf.png

38 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output base-andr oid-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png	38 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output tools/tes ts/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/.temp-xfermod eimagefilter_pdf.png

39 mv base-android-galaxy-nexus/.temp-xfermodeimagefilter_pdf.png base-android-gala xy-nexus/xfermodeimagefilter_pdf.png	39 mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-galaxy-nexus/. temp-xfermodeimagefilter_pdf.png tools/tests/rebaseline/input/fake-gm-expected-d ir/base-android-galaxy-nexus/xfermodeimagefilter_pdf.png

40 svn add --quiet base-android-galaxy-nexus/xfermodeimagefilter_pdf.png	40 svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-android-g alaxy-nexus/xfermodeimagefilter_pdf.png

41 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/xfermodeim agefilter_pdf.png	41 svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm -expected-dir/base-android-galaxy-nexus/xfermodeimagefilter_pdf.png

42	42

43 #	43 #

44 # 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 ...	44 # 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 ...

45 # ... found files_to_rebaseline [u'3x3bitmaprect_565.png', u'3x3bitmaprect_8888. png', u'xfermodeimagefilter_pdf.png']	45 # ... found files_to_rebaseline [u'3x3bitmaprect_565.png', u'3x3bitmaprect_8888. png', u'xfermodeimagefilter_pdf.png']

46 #	46 #

47	47

48 # 3x3bitmaprect_565.png	48 # 3x3bitmaprect_565.png

49 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output base-shuttle-wi n7-intel-float/.temp-3x3bitmaprect_565.png	49 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png --output tools/tests/reb aseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmap rect_565.png

50 mv base-shuttle-win7-intel-float/.temp-3x3bitmaprect_565.png base-shuttle-win7-i ntel-float/3x3bitmaprect_565.png	50 mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-flo at/.temp-3x3bitmaprect_565.png tools/tests/rebaseline/input/fake-gm-expected-dir /base-shuttle-win7-intel-float/3x3bitmaprect_565.png

51 svn add --quiet base-shuttle-win7-intel-float/3x3bitmaprect_565.png	51 svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-w in7-intel-float/3x3bitmaprect_565.png

52 svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/3x3bit maprect_565.png	52 svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm -expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_565.png

53	53

54 # 3x3bitmaprect_8888.png	54 # 3x3bitmaprect_8888.png

55 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output base-shuttle-win 7-intel-float/.temp-3x3bitmaprect_8888.png	55 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png --output tools/tests/reba seline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-3x3bitmapr ect_8888.png

56 mv base-shuttle-win7-intel-float/.temp-3x3bitmaprect_8888.png base-shuttle-win7- intel-float/3x3bitmaprect_8888.png	56 mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-flo at/.temp-3x3bitmaprect_8888.png tools/tests/rebaseline/input/fake-gm-expected-di r/base-shuttle-win7-intel-float/3x3bitmaprect_8888.png

57 svn add --quiet base-shuttle-win7-intel-float/3x3bitmaprect_8888.png	57 svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-w in7-intel-float/3x3bitmaprect_8888.png

58 svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/3x3bit maprect_8888.png	58 svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm -expected-dir/base-shuttle-win7-intel-float/3x3bitmaprect_8888.png

59	59

60 # xfermodeimagefilter_pdf.png	60 # xfermodeimagefilter_pdf.png

61 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output base-shut tle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png	61 curl --fail --silent http://chromium-skia-gm.commondatastorage.googleapis.com/gm /bitmap-64bitMD5/xfermodeimagefilter/16502178848783208088.png --output tools/tes ts/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-float/.temp-xfe rmodeimagefilter_pdf.png

62 mv base-shuttle-win7-intel-float/.temp-xfermodeimagefilter_pdf.png base-shuttle- win7-intel-float/xfermodeimagefilter_pdf.png	62 mv tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-win7-intel-flo at/.temp-xfermodeimagefilter_pdf.png tools/tests/rebaseline/input/fake-gm-expect ed-dir/base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png

63 svn add --quiet base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png	63 svn add --quiet tools/tests/rebaseline/input/fake-gm-expected-dir/base-shuttle-w in7-intel-float/xfermodeimagefilter_pdf.png

64 svn propset --quiet svn:mime-type image/png base-shuttle-win7-intel-float/xfermo deimagefilter_pdf.png	64 svn propset --quiet svn:mime-type image/png tools/tests/rebaseline/input/fake-gm -expected-dir/base-shuttle-win7-intel-float/xfermodeimagefilter_pdf.png

OLD	NEW