scripts/slave/recipes/swarming/staging.expected/android.json - Issue 1365683002: chromium_tests: fix crash in deapply_patch on got_webkit_revision

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/swarming/staging.expected/android.json

Issue 1365683002: chromium_tests: fix crash in deapply_patch on got_webkit_revision (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Created 5 years, 3 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

« scripts/slave/recipes/blink_trybot.py ('K') | « scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Windows_deterministic.json ('k') | scripts/slave/recipes/swarming/staging.expected/linux_Debug.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/swarming/staging.expected/android.json

diff --git a/scripts/slave/recipes/swarming/staging.expected/android.json b/scripts/slave/recipes/swarming/staging.expected/android.json

index 125cdd63db91d9441968e8621d8b026d630a2d00..9f6015af671d0e881894d01ebfd845e8358ca803 100644

--- a/scripts/slave/recipes/swarming/staging.expected/android.json

+++ b/scripts/slave/recipes/swarming/staging.expected/android.json

@@ -24,7 +24,7 @@

"--root",

"src",

"--revision_mapping_file",

- "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",

+ "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",

"--output_json",

"/path/to/tmp/json",

"--revision",

@@ -82,9 +82,6 @@

"@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",

"@@@STEP_LOG_LINE@json.output@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit/\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"revision\": 124383@@@",

- "@@@STEP_LOG_LINE@json.output@ }, @@@",

"@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",

"@@@STEP_LOG_LINE@json.output@ }, @@@",

@@ -97,12 +94,11 @@

"@@@STEP_LOG_LINE@json.output@ }@@@",

"@@@STEP_LOG_LINE@json.output@}@@@",

"@@@STEP_LOG_END@json.output@@@",

- "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",

- "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",

- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",

"@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",

"@@@SET_BUILD_PROPERTY@got_revision@170242@@@",

- "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@"

+ "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",

+ "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",

+ "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@"

]

{