AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This adds renderMode and builder as columns to the front end when looking at SKPs.

Browse Source 
BUG=skia:2833
NOTRY=true
R=epoger@google.com

Author: stephana@google.com

Review URL: https://codereview.chromium.org/480153002
This commit is contained in:
stephana 2014-08-18 13:37:59 -07:00 committed by Commit bot
parent 2a51d7c74c
commit 3b5c86c7a2
15 changed files with 194 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gm/gm_json.py
View File

@ -50,7 +50,8 @@ JSONKEY_ACTUALRESULTS_SUCCEEDED = 'succeeded'
# Descriptions of the result set as a whole.
JSONKEY_DESCRIPTIONS = 'descriptions'
JSONKEY_DESCRIPTIONS_BUILDER = 'builder'
JSONKEY_DESCRIPTIONS_RENDER_MODE = 'renderMode'
JSONKEY_EXPECTEDRESULTS = 'expected-results'

2
gm/rebaseline_server/compare_configs.py
View File

@ -15,7 +15,7 @@ import logging
import time
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
from py.utils import url_utils

2
gm/rebaseline_server/compare_configs_test.py
View File

@ -22,7 +22,7 @@ within self._output_dir_expected, which wouldn't be good...
import os
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
import base_unittest

44
gm/rebaseline_server/compare_rendered_pictures.py
View File

@ -21,7 +21,7 @@ import tempfile
import time
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
from py.utils import git_utils
@ -47,6 +47,11 @@ COLUMN__RESULT_TYPE = results.KEY__EXTRACOLUMNS__RESULT_TYPE
COLUMN__SOURCE_SKP = 'sourceSkpFile'
COLUMN__TILED_OR_WHOLE = 'tiledOrWhole'
COLUMN__TILENUM = 'tilenum'
COLUMN__BUILDER_A = 'builderA'
COLUMN__RENDER_MODE_A = 'renderModeA'
COLUMN__BUILDER_B = 'builderB'
COLUMN__RENDER_MODE_B = 'renderModeB'
FREEFORM_COLUMN_IDS = [
COLUMN__SOURCE_SKP,
COLUMN__TILENUM,
@ -56,6 +61,10 @@ ORDERED_COLUMN_IDS = [
COLUMN__SOURCE_SKP,
COLUMN__TILED_OR_WHOLE,
COLUMN__TILENUM,
COLUMN__BUILDER_A,
COLUMN__RENDER_MODE_A,
COLUMN__BUILDER_B,
COLUMN__RENDER_MODE_B,
]
# A special "repo:" URL type that we use to refer to Skia repo contents.
@ -262,6 +271,20 @@ class RenderedPicturesComparisons(results.BaseComparisons):
self._validate_dict_version(dictB)
dictB_results = self.get_default(dictB, {}, setB_section)
# get the builders and render modes for each set
builder_A = self.get_default(dictA, None,
gm_json.JSONKEY_DESCRIPTIONS,
gm_json.JSONKEY_DESCRIPTIONS_BUILDER)
render_mode_A = self.get_default(dictA, None,
gm_json.JSONKEY_DESCRIPTIONS,
gm_json.JSONKEY_DESCRIPTIONS_RENDER_MODE)
builder_B = self.get_default(dictB, None,
gm_json.JSONKEY_DESCRIPTIONS,
gm_json.JSONKEY_DESCRIPTIONS_BUILDER)
render_mode_B = self.get_default(dictB, None,
gm_json.JSONKEY_DESCRIPTIONS,
gm_json.JSONKEY_DESCRIPTIONS_RENDER_MODE)
skp_names = sorted(set(dictA_results.keys() + dictB_results.keys()))
# Just for manual testing... truncate to an arbitrary subset.
if self.truncate_results:
@ -277,6 +300,8 @@ class RenderedPicturesComparisons(results.BaseComparisons):
skp_name, gm_json.JSONKEY_SOURCE_WHOLEIMAGE)
imagepairs_for_this_skp.append(self._create_image_pair(
image_dict_A=whole_image_A, image_dict_B=whole_image_B,
builder_A=builder_A, render_mode_A=render_mode_A,
builder_B=builder_B, render_mode_B=render_mode_B,
source_skp_name=skp_name, tilenum=None))
tiled_images_A = self.get_default(
@ -295,6 +320,8 @@ class RenderedPicturesComparisons(results.BaseComparisons):
if tile_num < num_tiles_A else None),
image_dict_B=(tiled_images_B[tile_num]
if tile_num < num_tiles_B else None),
builder_A=builder_A, render_mode_A=render_mode_A,
builder_B=builder_B, render_mode_B=render_mode_B,
source_skp_name=skp_name, tilenum=tile_num))
for one_imagepair in imagepairs_for_this_skp:
@ -340,13 +367,22 @@ class RenderedPicturesComparisons(results.BaseComparisons):
raise Exception('expected header_revision %d, but got %d' % (
expected_header_revision, header_revision))
def _create_image_pair(self, image_dict_A, image_dict_B, source_skp_name,
def _create_image_pair(self, image_dict_A, image_dict_B,
builder_A, render_mode_A,
builder_B, render_mode_B,
source_skp_name,
tilenum):
"""Creates an ImagePair object for this pair of images.
Args:
image_dict_A: dict with JSONKEY_IMAGE_* keys, or None if no image
image_dict_B: dict with JSONKEY_IMAGE_* keys, or None if no image
builder_A: builder that created image set A or None if unknow
render_mode_A: render mode used to generate image set A or None if
unknown.
builder_B: builder that created image set A or None if unknow
render_mode_B: render mode used to generate image set A or None if
unknown.
source_skp_name: string; name of the source SKP file
tilenum: which tile, or None if a wholeimage
@ -382,6 +418,10 @@ class RenderedPicturesComparisons(results.BaseComparisons):
extra_columns_dict = {
COLUMN__RESULT_TYPE: result_type,
COLUMN__SOURCE_SKP: source_skp_name,
COLUMN__BUILDER_A: builder_A,
COLUMN__RENDER_MODE_A: render_mode_A,
COLUMN__BUILDER_B: builder_B,
COLUMN__RENDER_MODE_B: render_mode_B,
}
if tilenum == None:
extra_columns_dict[COLUMN__TILED_OR_WHOLE] = 'whole'

2
gm/rebaseline_server/compare_rendered_pictures_test.py
View File

@ -24,7 +24,7 @@ import posixpath
import subprocess
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
import base_unittest

2
gm/rebaseline_server/compare_to_expectations.py
View File

@ -17,7 +17,7 @@ import os
import time
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
from py.utils import url_utils

2
gm/rebaseline_server/download_actuals.py
View File

@ -17,7 +17,7 @@ import re
import urllib2
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
from py.utils import gs_utils

2
gm/rebaseline_server/download_actuals_test.py
View File

@ -22,7 +22,7 @@ within self._output_dir_expected, which wouldn't be good...
import os
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
from py.utils import url_utils

2
gm/rebaseline_server/imagediffdb.py
View File

@ -24,7 +24,7 @@ import time
import urllib
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
import find_run_binary

2
gm/rebaseline_server/imagepairset.py
View File

@ -13,7 +13,7 @@ ImagePairSet class; see its docstring below.
import posixpath
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
import column

2
gm/rebaseline_server/results.py
View File

@ -15,7 +15,7 @@ import os
import re
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
import gm_json

0
gm/rebaseline_server/fix_pythonpath.py → gm/rebaseline_server/rs_fixpypath.py
View File

2
gm/rebaseline_server/server.py
View File

@ -27,7 +27,7 @@ import urllib
import urlparse
# Must fix up PYTHONPATH before importing from within Skia
import fix_pythonpath # pylint: disable=W0611
import rs_fixpypath # pylint: disable=W0611
# Imports from within Skia
from py.utils import gs_utils

72
gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json vendored
View File

@ -1,5 +1,53 @@
{
"extraColumnHeaders": {
"builderA": {
"headerText": "builderA",
"isFilterable": true,
"isSortable": true,
"useFreeformFilter": false,
"valuesAndCounts": [
[
null,
4
]
]
},
"builderB": {
"headerText": "builderB",
"isFilterable": true,
"isSortable": true,
"useFreeformFilter": false,
"valuesAndCounts": [
[
null,
4
]
]
},
"renderModeA": {
"headerText": "renderModeA",
"isFilterable": true,
"isSortable": true,
"useFreeformFilter": false,
"valuesAndCounts": [
[
null,
4
]
]
},
"renderModeB": {
"headerText": "renderModeB",
"isFilterable": true,
"isSortable": true,
"useFreeformFilter": false,
"valuesAndCounts": [
[
null,
4
]
]
},
"resultType": {
"headerText": "resultType",
"isFilterable": true,
@ -73,10 +121,14 @@
"resultType",
"sourceSkpFile",
"tiledOrWhole",
"tilenum"
"tilenum",
"builderA",
"renderModeA",
"builderB",
"renderModeB"
],
"header": {
"dataHash": "-4754972663365911725",
"dataHash": "-1510211866509185075",
"isEditable": false,
"isExported": true,
"schemaVersion": 5,
@ -101,6 +153,10 @@
"imagePairs": [
{
"extraColumns": {
"builderA": null,
"builderB": null,
"renderModeA": null,
"renderModeB": null,
"resultType": "failed",
"sourceSkpFile": "changed.skp",
"tiledOrWhole": "whole",
@ -112,6 +168,10 @@
},
{
"extraColumns": {
"builderA": null,
"builderB": null,
"renderModeA": null,
"renderModeB": null,
"resultType": "no-comparison",
"sourceSkpFile": "only-in-after.skp",
"tiledOrWhole": "whole",
@ -123,6 +183,10 @@
},
{
"extraColumns": {
"builderA": null,
"builderB": null,
"renderModeA": null,
"renderModeB": null,
"resultType": "no-comparison",
"sourceSkpFile": "only-in-before.skp",
"tiledOrWhole": "whole",
@ -134,6 +198,10 @@
},
{
"extraColumns": {
"builderA": null,
"builderB": null,
"renderModeA": null,
"renderModeB": null,
"resultType": "succeeded",
"sourceSkpFile": "unchanged.skp",
"tiledOrWhole": "whole",

72
gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_repo_url/compare_rendered_pictures.json vendored
View File

@ -1,5 +1,53 @@
{
"extraColumnHeaders": {
"builderA": {
"headerText": "builderA",
"isFilterable": true,
"isSortable": true,
"useFreeformFilter": false,
"valuesAndCounts": [
[
null,
4
]
]
},
"builderB": {
"headerText": "builderB",
"isFilterable": true,
"isSortable": true,
"useFreeformFilter": false,
"valuesAndCounts": [
[
null,
4
]
]
},
"renderModeA": {
"headerText": "renderModeA",
"isFilterable": true,
"isSortable": true,
"useFreeformFilter": false,
"valuesAndCounts": [
[
null,
4
]
]
},
"renderModeB": {
"headerText": "renderModeB",
"isFilterable": true,
"isSortable": true,
"useFreeformFilter": false,
"valuesAndCounts": [
[
null,
4
]
]
},
"resultType": {
"headerText": "resultType",
"isFilterable": true,
@ -73,10 +121,14 @@
"resultType",
"sourceSkpFile",
"tiledOrWhole",
"tilenum"
"tilenum",
"builderA",
"renderModeA",
"builderB",
"renderModeB"
],
"header": {
"dataHash": "-4754972663365911725",
"dataHash": "-1510211866509185075",
"isEditable": false,
"isExported": true,
"schemaVersion": 5,
@ -101,6 +153,10 @@
"imagePairs": [
{
"extraColumns": {
"builderA": null,
"builderB": null,
"renderModeA": null,
"renderModeB": null,
"resultType": "failed",
"sourceSkpFile": "changed.skp",
"tiledOrWhole": "whole",
@ -112,6 +168,10 @@
},
{
"extraColumns": {
"builderA": null,
"builderB": null,
"renderModeA": null,
"renderModeB": null,
"resultType": "no-comparison",
"sourceSkpFile": "only-in-after.skp",
"tiledOrWhole": "whole",
@ -123,6 +183,10 @@
},
{
"extraColumns": {
"builderA": null,
"builderB": null,
"renderModeA": null,
"renderModeB": null,
"resultType": "no-comparison",
"sourceSkpFile": "only-in-before.skp",
"tiledOrWhole": "whole",
@ -134,6 +198,10 @@
},
{
"extraColumns": {
"builderA": null,
"builderB": null,
"renderModeA": null,
"renderModeB": null,
"resultType": "succeeded",
"sourceSkpFile": "unchanged.skp",
"tiledOrWhole": "whole",