Index: scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_asan_rel.json |
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_asan_rel.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_asan_rel.json |
index d3f92e357623ec3461ac07b72747574d5859a7f9..55041f3494291e845e9607ce17e311263e86a178 100644 |
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_asan_rel.json |
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_asan_rel.json |
@@ -15,7 +15,7 @@ |
"--root", |
"v8", |
"--revision_mapping_file", |
- "{\"v8\": \"got_revision\"}", |
+ "{\"v8\": \"got_revision\", \"v8/tools/swarming_client\": \"got_swarming_client_revision\"}", |
"--issue", |
"12853011", |
"--patchset", |
@@ -39,20 +39,42 @@ |
"@@@STEP_LOG_LINE@json.output@ \"v8\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/v8.git\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f2cbea7e89a45f46819777bb78a1f5bd0241f64c\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"v8/tools/swarming_client\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/v8/tools/swarming_client.git\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"e4fee0b18f8163be6097c9c571640038896debc4\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"v8\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f2cbea7e89a45f46819777bb78a1f5bd0241f64c\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#50110}\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#50110}\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"e4fee0b18f8163be6097c9c571640038896debc4\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#108913}\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"root\": \"v8\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@", |
"@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@", |
"@@@SET_BUILD_PROPERTY@got_revision@\"f2cbea7e89a45f46819777bb78a1f5bd0241f64c\"@@@", |
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#50110}\"@@@" |
+ "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#50110}\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#108913}\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"e4fee0b18f8163be6097c9c571640038896debc4\"@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py", |
+ "--version" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "swarming.py --version", |
+ "stdout": "/path/to/tmp/", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@0.4.10@@@" |
] |
}, |
{ |
@@ -64,7 +86,7 @@ |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
- "GYP_DEFINES": "asan=1 clang=1 dcheck_always_on=0 fastbuild=0 gomadir='[BUILD]/goma' lsan=1 target_arch=x64 use_goma=1 v8_target_arch=x64", |
+ "GYP_DEFINES": "asan=1 clang=1 dcheck_always_on=0 fastbuild=0 gomadir='[BUILD]/goma' lsan=1 target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64", |
"GYP_GENERATORS": "ninja" |
}, |
"name": "gclient runhooks" |
@@ -130,7 +152,91 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/v8/tools/run-tests.py", |
+ "RECIPE_MODULE[isolate]/resources/isolate.py", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client", |
+ "batcharchive", |
+ "--dump-json", |
+ "/path/to/tmp/json", |
+ "--isolate-server", |
+ "https://isolateserver.appspot.com", |
+ "--verbose", |
+ "[SLAVE_BUILD]/v8/out/Release/bot_default.isolated.gen.json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "isolate tests", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"bot_default\": \"[dummy hash for bot_default]\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py", |
+ "trigger", |
+ "--swarming", |
+ "https://chromium-swarm.appspot.com", |
+ "--isolate-server", |
+ "https://isolateserver.appspot.com", |
+ "--priority", |
+ "30", |
+ "--shards", |
+ "2", |
+ "--task-name", |
+ "Check/Mac-10.9/[dummy has/v8_mac64_asan_rel/571", |
+ "--dump-json", |
+ "/path/to/tmp/json", |
+ "--expiration", |
+ "3600", |
+ "--io-timeout", |
+ "1200", |
+ "--hard-timeout", |
+ "2700", |
+ "--dimension", |
+ "cpu", |
+ "x86-64", |
+ "--dimension", |
+ "gpu", |
+ "none", |
+ "--dimension", |
+ "os", |
+ "Mac-10.9", |
+ "--dimension", |
+ "pool", |
+ "Chrome", |
+ "--tag", |
+ "buildername:v8_mac64_asan_rel", |
+ "--tag", |
+ "buildnumber:571", |
+ "--tag", |
+ "data:[dummy hash for bot_default]", |
+ "--tag", |
+ "master:tryserver.v8", |
+ "--tag", |
+ "name:Check", |
+ "--tag", |
+ "os:Mac-10.9", |
+ "--tag", |
+ "patch_project:v8", |
+ "--tag", |
+ "project:v8", |
+ "--tag", |
+ "purpose:CQ", |
+ "--tag", |
+ "purpose:pre-commit", |
+ "--tag", |
+ "rietveld:https://codereview.chromium.org/12853011/#ps1", |
+ "--tag", |
+ "slavename:TestSlavename", |
+ "--tag", |
+ "stepname:Check on Mac-10.9", |
+ "--user", |
+ "commit-bot@chromium.org", |
+ "[dummy hash for bot_default]", |
+ "--", |
"--progress=verbose", |
"--mode", |
"Release", |
@@ -144,10 +250,56 @@ |
"--exhaustive-variants", |
"--asan", |
"--rerun-failures-count=2", |
+ "--swarming", |
"--json-test-results", |
- "/path/to/tmp/json" |
+ "${ISOLATED_OUTDIR}/output.json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "[trigger] Check on Mac-10.9", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"Check/Mac-10.9/[dummy has/v8_mac64_asan_rel/571\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"Check/Mac-10.9/[dummy has/v8_mac64_asan_rel/571:2:0\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"Check/Mac-10.9/[dummy has/v8_mac64_asan_rel/571:2:1\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 1, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10100\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10100\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@", |
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@", |
+ "@@@STEP_LINK@shard #1@https://chromium-swarm.appspot.com/user/task/10100@@@" |
+ ] |
+ }, |
+ { |
+ "allow_subannotations": true, |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[v8]/resources/collect_v8_task.py", |
+ "--swarming-client-dir", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client", |
+ "--temp-root-dir", |
+ "[TMP_BASE]", |
+ "--merged-test-output", |
+ "/path/to/tmp/json", |
+ "--", |
+ "collect", |
+ "--swarming", |
+ "https://chromium-swarm.appspot.com", |
+ "--decorate", |
+ "--print-status-updates", |
+ "--shards", |
+ "2", |
+ "Check/Mac-10.9/[dummy has/v8_mac64_asan_rel/571" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |