scripts/slave/recipes/chromium.expected/full_chromium_webkit_Linux_ChromiumOS_Full.json - Issue 1365683002: chromium_tests: fix crash in deapply_patch on got_webkit_revision

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_webkit_Linux_ChromiumOS_Full.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/chromium.expected/full_chromium_webkit_Linux_ChromiumOS_Builder__dbg_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_webkit_Linux_ChromiumOS_GN.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium.expected/full_chromium_webkit_Linux_ChromiumOS_Full.json

diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_Linux_ChromiumOS_Full.json b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_Linux_ChromiumOS_Full.json

index 923e9b0f9f9dab79f1923504e22841be1f80cd19..9ecd31bb1e9c5311a172aea2dc7b5747885a7fca 100644

--- a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_Linux_ChromiumOS_Full.json

+++ b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_Linux_ChromiumOS_Full.json

@@ -15,7 +15,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",

@@ -40,8 +40,6 @@

"@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision_cp\": \"refs/heads/master@{#124383}\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",

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

@@ -50,12 +48,10 @@

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

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

"@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",

- "@@@SET_BUILD_PROPERTY@got_webkit_revision@\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@",

"@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",

"@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",

"@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",

"@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",

- "@@@SET_BUILD_PROPERTY@got_webkit_revision_cp@\"refs/heads/master@{#124383}\"@@@",

"@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",

"@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",

"@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",

@@ -187,7 +183,7 @@

"--factory-properties",

"{\"gclient_env\": {\"GYP_DEFINES\": \"chromeos=1 component=static_library ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1\"}, \"gs_acl\": \"public-read\", \"gs_bucket\": \"gs://chromium-browser-snapshots\"}",

"--build-properties",

- "{\"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#170242}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webkit_revision\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\", \"got_webkit_revision_cp\": \"refs/heads/master@{#124383}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"}"

+ "{\"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#170242}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"}"

"cwd": "[SLAVE_BUILD]",

"name": "archive build"