Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac_GC_Stress.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac_GC_Stress.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac_GC_Stress.json |
index becbcfbcab750ed6eb2a707b4b7d9381819a5143..5233b4fdaf3fafe34a30ffbb97fdfab269bf7e8d 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac_GC_Stress.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac_GC_Stress.json |
@@ -15,7 +15,7 @@ |
"--root", |
"v8", |
"--revision_mapping_file", |
- "{\"v8\": \"got_revision\"}", |
+ "{\"v8\": \"got_revision\", \"v8/tools/swarming_client\": \"got_swarming_client_revision\"}", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -33,20 +33,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@@@" |
] |
}, |
{ |
@@ -58,7 +80,7 @@ |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
- "GYP_DEFINES": "clang=1 gomadir='[BUILD]/goma' target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=ia32", |
+ "GYP_DEFINES": "clang=1 gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=ia32", |
"GYP_GENERATORS": "ninja" |
}, |
"name": "gclient runhooks" |
@@ -122,7 +144,87 @@ |
"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/Debug/mjsunit.isolated.gen.json", |
+ "[SLAVE_BUILD]/v8/out/Debug/webkit.isolated.gen.json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "isolate tests", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"mjsunit\": \"[dummy hash for mjsunit]\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"webkit\": \"[dummy hash for webkit]\"@@@", |
+ "@@@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", |
+ "25", |
+ "--shards", |
+ "3", |
+ "--task-name", |
+ "Mjsunit/Mac-10.9/[dummy has/V8 Mac GC Stress/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 Mac GC Stress", |
+ "--tag", |
+ "buildnumber:571", |
+ "--tag", |
+ "data:[dummy hash for mjsunit]", |
+ "--tag", |
+ "master:client.v8", |
+ "--tag", |
+ "name:Mjsunit", |
+ "--tag", |
+ "os:Mac-10.9", |
+ "--tag", |
+ "project:v8", |
+ "--tag", |
+ "purpose:CI", |
+ "--tag", |
+ "purpose:post-commit", |
+ "--tag", |
+ "slavename:TestSlavename", |
+ "--tag", |
+ "stepname:Mjsunit on Mac-10.9", |
+ "[dummy hash for mjsunit]", |
+ "--", |
"--progress=verbose", |
"--mode", |
"Debug", |
@@ -136,10 +238,156 @@ |
"--exhaustive-variants", |
"--gc-stress", |
"--rerun-failures-count=2", |
+ "--swarming", |
"--json-test-results", |
- "/path/to/tmp/json" |
+ "${ISOLATED_OUTDIR}/output.json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "[trigger] Mjsunit on Mac-10.9", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"Mjsunit/Mac-10.9/[dummy has/V8 Mac GC Stress/571\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"Mjsunit/Mac-10.9/[dummy has/V8 Mac GC Stress/571:3: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@ \"Mjsunit/Mac-10.9/[dummy has/V8 Mac GC Stress/571:3: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@ \"Mjsunit/Mac-10.9/[dummy has/V8 Mac GC Stress/571:3:2\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 2, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10200\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10200\"@@@", |
+ "@@@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@@@", |
+ "@@@STEP_LINK@shard #2@https://chromium-swarm.appspot.com/user/task/10200@@@" |
+ ] |
+ }, |
+ { |
+ "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", |
+ "25", |
+ "--shards", |
+ "1", |
+ "--task-name", |
+ "Webkit/Mac-10.9/[dummy has/V8 Mac GC Stress/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 Mac GC Stress", |
+ "--tag", |
+ "buildnumber:571", |
+ "--tag", |
+ "data:[dummy hash for webkit]", |
+ "--tag", |
+ "master:client.v8", |
+ "--tag", |
+ "name:Webkit", |
+ "--tag", |
+ "os:Mac-10.9", |
+ "--tag", |
+ "project:v8", |
+ "--tag", |
+ "purpose:CI", |
+ "--tag", |
+ "purpose:post-commit", |
+ "--tag", |
+ "slavename:TestSlavename", |
+ "--tag", |
+ "stepname:Webkit on Mac-10.9", |
+ "[dummy hash for webkit]", |
+ "--", |
+ "--progress=verbose", |
+ "--mode", |
+ "Debug", |
+ "--arch", |
+ "ia32", |
+ "--outdir", |
+ "out", |
+ "--buildbot", |
+ "--timeout=200", |
+ "webkit", |
+ "--exhaustive-variants", |
+ "--gc-stress", |
+ "--rerun-failures-count=2", |
+ "--swarming", |
+ "--json-test-results", |
+ "${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "[trigger] Webkit on Mac-10.9", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"Webkit/Mac-10.9/[dummy has/V8 Mac GC Stress/571\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"Webkit/Mac-10.9/[dummy has/V8 Mac GC Stress/571\": {@@@", |
+ "@@@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@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@", |
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@" |
+ ] |
+ }, |
+ { |
+ "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", |
+ "3", |
+ "Mjsunit/Mac-10.9/[dummy has/V8 Mac GC Stress/571" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Mjsunit", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -159,27 +407,28 @@ |
] |
}, |
{ |
+ "allow_subannotations": true, |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/v8/tools/run-tests.py", |
- "--progress=verbose", |
- "--mode", |
- "Debug", |
- "--arch", |
- "ia32", |
- "--outdir", |
- "out", |
- "--buildbot", |
- "--timeout=200", |
- "webkit", |
- "--exhaustive-variants", |
- "--gc-stress", |
- "--rerun-failures-count=2", |
- "--json-test-results", |
- "/path/to/tmp/json" |
+ "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", |
+ "1", |
+ "Webkit/Mac-10.9/[dummy has/V8 Mac GC Stress/571" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Webkit", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |