tools/tests/rebaseline/using-json/output-expected/stdout - Issue 16093025: rebaseline.py: if --tests is not specified, get test list from actual-results.json

Side by Side Diff: tools/tests/rebaseline/using-json/output-expected/stdout

Issue 16093025: rebaseline.py: if --tests is not specified, get test list from actual-results.json (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: add_test_for_json_case Created 7 years, 6 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/using-json/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/actual-results.json ('K') | « tools/tests/rebaseline/using-json/output-expected/return_value ('k') | tools/tests/run.sh » ('j') | tools/tests/run.sh » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 # Getting tests to rebaseline from JSON summary URL file:tools/tests/rebaseline/ using-json/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/ base-android-galaxy-nexus/actual-results.json ...

	2 # ... found tests_to_rebaseline [u'imageblur_565.png', u'imageblur_8888.png', u' shadertext3_8888.png']

	3 # base-android-galaxy-nexus:

	4 # imageblur_565.png_565.png

	5 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_565.png_565.png --output base-android-galaxy-nexus/.temp-imageblu r_565.png_565.png

	6 mv base-android-galaxy-nexus/.temp-imageblur_565.png_565.png base-android-galaxy -nexus/imageblur_565.png_565.png

	7 svn add --quiet base-android-galaxy-nexus/imageblur_565.png_565.png

	8 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 565.png_565.png

	9 # imageblur_565.png_8888.png
	epoger 2013/06/05 02:42:56 These self-test results aren't quite right. We ha These self-test results aren't quite right. We have gotten the list of tests to rebaseline from the JSON file as [u'imageblur_565.png', u'imageblur_8888.png', u'shadertext3_8888.png'], and then multiplying those by all the config combinations: imageblur_565.png_565.png imageblur_565.png_8888.png imageblur_565.png_gpu.png etc. Instead, if we are getting the list of tests to rebaseline from the JSON file, that list includes the configs we need to rebaseline.
	10 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_565.png_8888.png --output base-android-galaxy-nexus/.temp-imagebl ur_565.png_8888.png

	11 mv base-android-galaxy-nexus/.temp-imageblur_565.png_8888.png base-android-galax y-nexus/imageblur_565.png_8888.png

	12 svn add --quiet base-android-galaxy-nexus/imageblur_565.png_8888.png

	13 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 565.png_8888.png

	14 # imageblur_565.png_gpu.png

	15 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_565.png_gpu.png --output base-android-galaxy-nexus/.temp-imageblu r_565.png_gpu.png

	16 mv base-android-galaxy-nexus/.temp-imageblur_565.png_gpu.png base-android-galaxy -nexus/imageblur_565.png_gpu.png

	17 svn add --quiet base-android-galaxy-nexus/imageblur_565.png_gpu.png

	18 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 565.png_gpu.png

	19 # imageblur_565.png_pdf.png

	20 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_565.png_pdf.png --output base-android-galaxy-nexus/.temp-imageblu r_565.png_pdf.png

	21 mv base-android-galaxy-nexus/.temp-imageblur_565.png_pdf.png base-android-galaxy -nexus/imageblur_565.png_pdf.png

	22 svn add --quiet base-android-galaxy-nexus/imageblur_565.png_pdf.png

	23 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 565.png_pdf.png

	24 # imageblur_565.png_mesa.png

	25 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_565.png_mesa.png --output base-android-galaxy-nexus/.temp-imagebl ur_565.png_mesa.png

	26 mv base-android-galaxy-nexus/.temp-imageblur_565.png_mesa.png base-android-galax y-nexus/imageblur_565.png_mesa.png

	27 svn add --quiet base-android-galaxy-nexus/imageblur_565.png_mesa.png

	28 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 565.png_mesa.png

	29 # imageblur_565.png_msaa16.png

	30 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_565.png_msaa16.png --output base-android-galaxy-nexus/.temp-image blur_565.png_msaa16.png

	31 mv base-android-galaxy-nexus/.temp-imageblur_565.png_msaa16.png base-android-gal axy-nexus/imageblur_565.png_msaa16.png

	32 svn add --quiet base-android-galaxy-nexus/imageblur_565.png_msaa16.png

	33 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 565.png_msaa16.png

	34 # imageblur_565.png_msaa4.png

	35 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_565.png_msaa4.png --output base-android-galaxy-nexus/.temp-imageb lur_565.png_msaa4.png

	36 mv base-android-galaxy-nexus/.temp-imageblur_565.png_msaa4.png base-android-gala xy-nexus/imageblur_565.png_msaa4.png

	37 svn add --quiet base-android-galaxy-nexus/imageblur_565.png_msaa4.png

	38 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 565.png_msaa4.png

	39 # base-android-galaxy-nexus:

	40 # imageblur_8888.png_565.png

	41 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_8888.png_565.png --output base-android-galaxy-nexus/.temp-imagebl ur_8888.png_565.png

	42 mv base-android-galaxy-nexus/.temp-imageblur_8888.png_565.png base-android-galax y-nexus/imageblur_8888.png_565.png

	43 svn add --quiet base-android-galaxy-nexus/imageblur_8888.png_565.png

	44 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 8888.png_565.png

	45 # imageblur_8888.png_8888.png

	46 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_8888.png_8888.png --output base-android-galaxy-nexus/.temp-imageb lur_8888.png_8888.png

	47 mv base-android-galaxy-nexus/.temp-imageblur_8888.png_8888.png base-android-gala xy-nexus/imageblur_8888.png_8888.png

	48 svn add --quiet base-android-galaxy-nexus/imageblur_8888.png_8888.png

	49 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 8888.png_8888.png

	50 # imageblur_8888.png_gpu.png

	51 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_8888.png_gpu.png --output base-android-galaxy-nexus/.temp-imagebl ur_8888.png_gpu.png

	52 mv base-android-galaxy-nexus/.temp-imageblur_8888.png_gpu.png base-android-galax y-nexus/imageblur_8888.png_gpu.png

	53 svn add --quiet base-android-galaxy-nexus/imageblur_8888.png_gpu.png

	54 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 8888.png_gpu.png

	55 # imageblur_8888.png_pdf.png

	56 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_8888.png_pdf.png --output base-android-galaxy-nexus/.temp-imagebl ur_8888.png_pdf.png

	57 mv base-android-galaxy-nexus/.temp-imageblur_8888.png_pdf.png base-android-galax y-nexus/imageblur_8888.png_pdf.png

	58 svn add --quiet base-android-galaxy-nexus/imageblur_8888.png_pdf.png

	59 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 8888.png_pdf.png

	60 # imageblur_8888.png_mesa.png

	61 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_8888.png_mesa.png --output base-android-galaxy-nexus/.temp-imageb lur_8888.png_mesa.png

	62 mv base-android-galaxy-nexus/.temp-imageblur_8888.png_mesa.png base-android-gala xy-nexus/imageblur_8888.png_mesa.png

	63 svn add --quiet base-android-galaxy-nexus/imageblur_8888.png_mesa.png

	64 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 8888.png_mesa.png

	65 # imageblur_8888.png_msaa16.png

	66 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_8888.png_msaa16.png --output base-android-galaxy-nexus/.temp-imag eblur_8888.png_msaa16.png

	67 mv base-android-galaxy-nexus/.temp-imageblur_8888.png_msaa16.png base-android-ga laxy-nexus/imageblur_8888.png_msaa16.png

	68 svn add --quiet base-android-galaxy-nexus/imageblur_8888.png_msaa16.png

	69 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 8888.png_msaa16.png

	70 # imageblur_8888.png_msaa4.png

	71 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/imageblur_8888.png_msaa4.png --output base-android-galaxy-nexus/.temp-image blur_8888.png_msaa4.png

	72 mv base-android-galaxy-nexus/.temp-imageblur_8888.png_msaa4.png base-android-gal axy-nexus/imageblur_8888.png_msaa4.png

	73 svn add --quiet base-android-galaxy-nexus/imageblur_8888.png_msaa4.png

	74 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/imageblur_ 8888.png_msaa4.png

	75 # base-android-galaxy-nexus:

	76 # shadertext3_8888.png_565.png

	77 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/shadertext3_8888.png_565.png --output base-android-galaxy-nexus/.temp-shade rtext3_8888.png_565.png

	78 mv base-android-galaxy-nexus/.temp-shadertext3_8888.png_565.png base-android-gal axy-nexus/shadertext3_8888.png_565.png

	79 svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png_565.png

	80 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext 3_8888.png_565.png

	81 # shadertext3_8888.png_8888.png

	82 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/shadertext3_8888.png_8888.png --output base-android-galaxy-nexus/.temp-shad ertext3_8888.png_8888.png

	83 mv base-android-galaxy-nexus/.temp-shadertext3_8888.png_8888.png base-android-ga laxy-nexus/shadertext3_8888.png_8888.png

	84 svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png_8888.png

	85 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext 3_8888.png_8888.png

	86 # shadertext3_8888.png_gpu.png

	87 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/shadertext3_8888.png_gpu.png --output base-android-galaxy-nexus/.temp-shade rtext3_8888.png_gpu.png

	88 mv base-android-galaxy-nexus/.temp-shadertext3_8888.png_gpu.png base-android-gal axy-nexus/shadertext3_8888.png_gpu.png

	89 svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png_gpu.png

	90 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext 3_8888.png_gpu.png

	91 # shadertext3_8888.png_pdf.png

	92 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/shadertext3_8888.png_pdf.png --output base-android-galaxy-nexus/.temp-shade rtext3_8888.png_pdf.png

	93 mv base-android-galaxy-nexus/.temp-shadertext3_8888.png_pdf.png base-android-gal axy-nexus/shadertext3_8888.png_pdf.png

	94 svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png_pdf.png

	95 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext 3_8888.png_pdf.png

	96 # shadertext3_8888.png_mesa.png

	97 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/shadertext3_8888.png_mesa.png --output base-android-galaxy-nexus/.temp-shad ertext3_8888.png_mesa.png

	98 mv base-android-galaxy-nexus/.temp-shadertext3_8888.png_mesa.png base-android-ga laxy-nexus/shadertext3_8888.png_mesa.png

	99 svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png_mesa.png

	100 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext 3_8888.png_mesa.png

	101 # shadertext3_8888.png_msaa16.png

	102 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/shadertext3_8888.png_msaa16.png --output base-android-galaxy-nexus/.temp-sh adertext3_8888.png_msaa16.png

	103 mv base-android-galaxy-nexus/.temp-shadertext3_8888.png_msaa16.png base-android- galaxy-nexus/shadertext3_8888.png_msaa16.png

	104 svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png_msaa16.png

	105 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext 3_8888.png_msaa16.png

	106 # shadertext3_8888.png_msaa4.png

	107 curl --fail --silent http://skia-autogen.googlecode.com/svn/gm-actual/base-andro id-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-n exus/shadertext3_8888.png_msaa4.png --output base-android-galaxy-nexus/.temp-sha dertext3_8888.png_msaa4.png

	108 mv base-android-galaxy-nexus/.temp-shadertext3_8888.png_msaa4.png base-android-g alaxy-nexus/shadertext3_8888.png_msaa4.png

	109 svn add --quiet base-android-galaxy-nexus/shadertext3_8888.png_msaa4.png

	110 svn propset --quiet svn:mime-type image/png base-android-galaxy-nexus/shadertext 3_8888.png_msaa4.png

	111 # Getting tests to rebaseline from JSON summary URL file:tools/tests/rebaseline/ using-json/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/b ase-shuttle-win7-intel-float/actual-results.json ...

	112 # ... found tests_to_rebaseline []

OLD	NEW