scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json - Issue 2402583003: Revert "Fix file.copy recipe_module to not fail if files are already equal."

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: scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json

Issue 2402583003: Revert "Fix file.copy recipe_module to not fail if files are already equal." (Closed)

Patch Set: Created 4 years, 2 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 | « scripts/slave/recipes/skia/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/big_issue_number.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json

diff --git a/scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json b/scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json

index 748200236587cb4572213ed97c2086210ba12389..384c579e01ea07a112bfcc9de3a6a41b7a04ba94 100644

--- a/scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json

+++ b/scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json

@@ -267,7 +267,7 @@

"cmd": [

"python",

"-u",

- "\nimport shutil\nimport sys\n# Apparently, shutil.copy fails if files are binary-equal on *nix OSes.\n# See http://crbug.com/636168#c8.\nif hasattr(shutil, '_samefile'):\n if shutil._samefile(sys.argv[1], sys.argv[2]):\n sys.exit(0)\nshutil.copy(sys.argv[1], sys.argv[2])\n",

+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

"[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION",

"/path/to/tmp/"

@@ -304,7 +304,7 @@

"cmd": [

"python",

"-u",

+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

"[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION",

"/path/to/tmp/"