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

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

Index: scripts/slave/recipes/blink_trybot.expected/minimal_pass_continues.json

diff --git a/scripts/slave/recipes/blink_trybot.expected/minimal_pass_continues.json b/scripts/slave/recipes/blink_trybot.expected/minimal_pass_continues.json

index df86d455d8a0a1c8e621feac578905eab3e2f30d..c65eaf8b062fec90786e61812b643a40d6834755 100644

--- a/scripts/slave/recipes/blink_trybot.expected/minimal_pass_continues.json

+++ b/scripts/slave/recipes/blink_trybot.expected/minimal_pass_continues.json

@@ -15,7 +15,7 @@

"--root",

"src/v8",

"--revision_mapping_file",

- "{\"src\": \"got_cr_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_revision\"}",

+ "{\"src\": \"got_cr_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_revision\"}",

"--issue",

"12853011",

"--patchset",

@@ -47,8 +47,6 @@

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

"@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",

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

- "@@@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@ }, @@@",

@@ -58,16 +56,14 @@

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

"@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",

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

- "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@",

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

+ "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",

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

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

"@@@SET_BUILD_PROPERTY@got_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",

"@@@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_revision_cp@\"refs/heads/master@{#43426}\"@@@",

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

- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@"

+ "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@"

]

{

@@ -339,237 +335,28 @@

"name": "archive_webkit_tests_results",

"~followup_annotations": [

"@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/v8_linux_layout_dbg/571/layout-test-results/results.html@@@",

- "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/v8_linux_layout_dbg/571/layout-test-results.zip@@@"

+ "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/v8_linux_layout_dbg/571/layout-test-results.zip@@@",

+ "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"

]

{

"cmd": [

"python",

"-u",

- "[BUILD]/scripts/slave/bot_update.py",

- "--master",

- "tryserver.v8",

- "--builder",

- "v8_linux_layout_dbg",

- "--slave",

- "TestSlavename",

- "--spec",

- "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'v8_branch': 'branches/bleeding_edge', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]",

- "--root",

- "src/third_party/WebKit",

- "--revision_mapping_file",

- "--rietveld_server",

- "https://codereview.chromium.org",

- "--output_json",

- "/path/to/tmp/json",

- "--revision",

- "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "--revision",

- "src/third_party/WebKit@5e2293dffc3cd07d37fbedea3b500f0eb650614d",

- "--revision",

- "src/v8@bleeding_edge:HEAD",

- "--force"

- ],

- "cwd": "[SLAVE_BUILD]",

- "name": "bot_update (without patch)",

- "~followup_annotations": [

- "@@@STEP_TEXT@Some step text@@@",

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

- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",

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

- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",

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

- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",

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

- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",

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

- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",

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

- "@@@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@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",

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

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

- "@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",

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

- "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@",

- "@@@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@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",

- "@@@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_revision_cp@\"refs/heads/master@{#43426}\"@@@",

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

- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@"

- ]

- },

- {

- "cmd": [

- "python",

- "-u",

- "[DEPOT_TOOLS]/gclient.py",

- "runhooks"

- ],

- "cwd": "[SLAVE_BUILD]",

- "env": {

- "GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1"

- },

- "name": "gclient runhooks (2)"

- },

- {

- "cmd": [

- "python",

- "-u",

- "RECIPE_MODULE[isolate]/resources/find_isolated_tests.py",

- "--build-dir",

- "[SLAVE_BUILD]/src/out/Debug",

- "--clean-isolated-files"

- ],

- "cwd": "[SLAVE_BUILD]",

- "name": "clean isolated files (2)"

- },

- {

- "cmd": [

- "python",

- "-u",

- "[BUILD]/scripts/slave/compile.py",

- "--target",

- "Debug",

- "--src-dir",

- "[SLAVE_BUILD]/src",

- "--build-tool",

- "ninja",

- "--compiler",

- "goma",

- "--goma-dir",

- "[BUILD]/goma",

- "--goma-fail-fast",

- "--goma-disable-local-fallback",

- "--",

- "blink_tests"

- ],

- "cwd": "[SLAVE_BUILD]",

- "name": "compile (2)"

- },

- {

- "cmd": [

- "python",

- "-u",

- "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n",

- "/path/to/tmp/",

- "[SLAVE_BUILD]/src/out/Debug/*.isolated.gen.json"

- ],

- "cwd": "[SLAVE_BUILD]",

- "name": "find isolated targets (2)"

- },

- {

- "cmd": [

- "python",

- "-u",

- "RECIPE_MODULE[isolate]/resources/isolate.py",

- "[SLAVE_BUILD]/src/tools/swarming_client",

- "batcharchive",

- "--dump-json",

- "/path/to/tmp/json",

- "--isolate-server",

- "https://isolateserver.appspot.com",

- "[SLAVE_BUILD]/src/out/Debug/dummy_target_1.isolated.gen.json",

- "[SLAVE_BUILD]/src/out/Debug/dummy_target_2.isolated.gen.json"

- ],

- "cwd": "[SLAVE_BUILD]",

- "name": "isolate tests (2)",

- "~followup_annotations": [

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

- "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",

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

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

- "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"

- ]

- },

- {

- "cmd": [

- "python",

- "-u",

- "[BUILD]/scripts/slave/runtest.py",

- "--target",

- "Debug",

- "--no-xvfb",

- "--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"v8_linux_layout_dbg\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.v8\", \"patch_project\": \"blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"angle_unittests\": \"[dummy hash for angle_unittests]\", \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", \"gl_tests\": \"[dummy hash for gl_tests]\", \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",

- "--build-properties",

- "--step-name=webkit_tests (without patch)",

- "--builder-name=v8_linux_layout_dbg",

- "--slave-name=TestSlavename",

- "--build-number=571",

- "--run-python-script",

- "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",

- "--target",

- "Debug",

- "-o",

- "[SLAVE_BUILD]/layout-test-results",

- "--build-dir",

- "[SLAVE_BUILD]/src/out",

- "--json-test-results",

- "/path/to/tmp/json",

- "--test-results-server",

- "test-results.appspot.com",

- "--build-number",

- "571",

- "--builder-name",

- "v8_linux_layout_dbg",

- "--test-list",

- "bad/totally-bad-probably.html\ntricky/totally-maybe-not-awesome.html",

- "--skipped",

- "always"

- ],

- "cwd": "[SLAVE_BUILD]",

- "name": "webkit_tests (without patch)",

- "~followup_annotations": [

- "@@@STEP_TEXT@ Total executed: 9001 @@@"

- ]

- },

- {

- "cmd": [

- "python",

- "-u",

- "\nimport sys, json\nfailures = json.load(open(sys.argv[1], 'rb'))\n\nsuccess = True\n\nif failures['new']:\n success = False\n print 'New failures:'\n for f in failures['new']:\n print f\n\nif failures['ignored']:\n print 'Ignored failures:'\n for f in failures['ignored']:\n print f\n\nsys.exit(0 if success else 1)\n",

- "{\"ignored\": [], \"new\": [\"bad/totally-bad-probably.html\", \"tricky/totally-maybe-not-awesome.html\"]}"

+ "import sys; sys.exit(1)"

"cwd": "[SLAVE_BUILD]",

"name": "webkit_tests",

"~followup_annotations": [

- "@@@STEP_TEXT@ failures: bad/totally-bad-probably.html tricky/totally-maybe-not-awesome.html @@@",