buildbot/slave/skia_slave_scripts/upload_gm_results.py - Issue 23120002: Remove base-* directories from gm expected/actual paths; just use platform names

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: buildbot/slave/skia_slave_scripts/upload_gm_results.py

Issue 23120002: Remove base-* directories from gm expected/actual paths; just use platform names (Closed) Base URL: http://skia.googlecode.com/svn/

Patch Set: apply_comments_from_patchset5 Created 7 years, 4 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

« no previous file with comments | « buildbot/slave/skia_slave_scripts/run_gm.py ('k') | trunk/expectations/gm/base-android-galaxy-nexus/expected-results.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: buildbot/slave/skia_slave_scripts/upload_gm_results.py

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

--- buildbot/slave/skia_slave_scripts/upload_gm_results.py (revision 10814)

+++ buildbot/slave/skia_slave_scripts/upload_gm_results.py (working copy)

@@ -82,12 +82,11 @@

merge_options.commit_message = 'UploadGMResults of r%s on %s' % (

self._got_revision, self._args['builder_name'])

# pylint: disable=W0201

- merge_options.dest_svn_url = '%s/%s/%s/%s' % (

- gm_actual_svn_baseurl, self._args['gm_image_subdir'],

- self._args['builder_name'], self._args['gm_image_subdir'])

+ merge_options.dest_svn_url = '%s/%s' % (

+ gm_actual_svn_baseurl, self._args['builder_name'])

# pylint: disable=W0201

merge_options.merge_dir_path = os.path.join(gm_merge_basedir,

- self._args['gm_image_subdir'])

+ self._args['builder_name'])

# Clear out the merge_dir, in case it has old imagefiles in it from the

# bad old days when we were still uploading actual images to skia-autogen.

# This resolves https://code.google.com/p/skia/issues/detail?id=1362 ('some

@@ -124,7 +123,7 @@

def _Run(self):

gm_output_dir = os.path.join(os.pardir, os.pardir, 'gm', 'actual',

- self._args['gm_image_subdir'])

+ self._args['builder_name'])

self._GSUploadAllImages(src_dir=gm_output_dir)

self._SVNUploadJsonFiles(src_dir=gm_output_dir)