Index: infra/bots/recipes/swarm_test.expected/adb_in_path.json |
diff --git a/infra/bots/recipes/swarm_test.expected/adb_in_path.json b/infra/bots/recipes/swarm_test.expected/adb_in_path.json |
index b6d025657d1d1997674df9db47389de9969f2bda..29bc01d03ca45f82f1bfd1e4c87a31ebde69f4e3 100644 |
--- a/infra/bots/recipes/swarm_test.expected/adb_in_path.json |
+++ b/infra/bots/recipes/swarm_test.expected/adb_in_path.json |
@@ -1,52 +1,6 @@ |
[ |
{ |
"cmd": [ |
- "python", |
- "-u", |
- "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", |
- "/path/to/tmp/json", |
- "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug" |
- ], |
- "cwd": "[SLAVE_BUILD]/skia", |
- "name": "exec buildbot_spec.py", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"grouper\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
"which", |
"adb" |
], |
@@ -555,7 +509,303 @@ |
"--writePath", |
"/storage/emulated/legacy/skiabot/skia_dm", |
"--nocpu", |
- "--dummy-flags" |
+ "--config", |
+ "565", |
+ "8888", |
+ "gpu", |
+ "gpusrgb", |
+ "serialize-8888", |
+ "tiles_rt-8888", |
+ "pic-8888", |
+ "--src", |
+ "tests", |
+ "gm", |
+ "image", |
+ "--blacklist", |
+ "f16", |
+ "_", |
+ "_", |
+ "dstreadshuffle", |
+ "f16", |
+ "image", |
+ "_", |
+ "_", |
+ "srgb", |
+ "image", |
+ "_", |
+ "_", |
+ "gpusrgb", |
+ "image", |
+ "_", |
+ "_", |
+ "_", |
+ "test", |
+ "_", |
+ "GrShape", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "bleed_image", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "c_gms", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "colortype", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "colortype_xfermodes", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "drawfilter", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "fontmgr_bounds_0.75_0", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "fontmgr_bounds_1_-0.25", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "fontmgr_bounds", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "fontmgr_match", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "fontmgr_iter", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "bitmapfilters", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "bitmapshaders", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "bleed", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "bleed_alpha_bmp", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "bleed_alpha_bmp_shader", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "convex_poly_clip", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "extractalpha", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "filterbitmap_checkerboard_32_32_g8", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "filterbitmap_image_mandrill_64", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "shadows", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "simpleaaclip_aaclip", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "composeshader_bitmap", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "scaled_tilemodes_npot", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "scaled_tilemodes", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "bleed_alpha_image", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "bleed_alpha_image_shader", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "verylargebitmap", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "verylarge_picture_image", |
+ "sp-8888", |
+ "gm", |
+ "_", |
+ "drawfilter", |
+ "pic-8888", |
+ "gm", |
+ "_", |
+ "drawfilter", |
+ "2ndpic-8888", |
+ "gm", |
+ "_", |
+ "drawfilter", |
+ "sp-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-picture", |
+ "pic-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-picture", |
+ "2ndpic-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-picture", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-picture", |
+ "sp-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-raster", |
+ "pic-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-raster", |
+ "2ndpic-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-raster", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-raster", |
+ "sp-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-ctable", |
+ "pic-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-ctable", |
+ "2ndpic-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-ctable", |
+ "serialize-8888", |
+ "gm", |
+ "_", |
+ "image-cacherator-from-ctable", |
+ "_", |
+ "image", |
+ "_", |
+ "interlaced1.png", |
+ "_", |
+ "image", |
+ "_", |
+ "interlaced2.png", |
+ "_", |
+ "image", |
+ "_", |
+ "interlaced3.png", |
+ "_", |
+ "image", |
+ "_", |
+ ".arw", |
+ "_", |
+ "image", |
+ "_", |
+ ".cr2", |
+ "_", |
+ "image", |
+ "_", |
+ ".dng", |
+ "_", |
+ "image", |
+ "_", |
+ ".nef", |
+ "_", |
+ "image", |
+ "_", |
+ ".nrw", |
+ "_", |
+ "image", |
+ "_", |
+ ".orf", |
+ "_", |
+ "image", |
+ "_", |
+ ".raf", |
+ "_", |
+ "image", |
+ "_", |
+ ".rw2", |
+ "_", |
+ "image", |
+ "_", |
+ ".pef", |
+ "_", |
+ "image", |
+ "_", |
+ ".srw", |
+ "_", |
+ "image", |
+ "_", |
+ ".ARW", |
+ "_", |
+ "image", |
+ "_", |
+ ".CR2", |
+ "_", |
+ "image", |
+ "_", |
+ ".DNG", |
+ "_", |
+ "image", |
+ "_", |
+ ".NEF", |
+ "_", |
+ "image", |
+ "_", |
+ ".NRW", |
+ "_", |
+ "image", |
+ "_", |
+ ".ORF", |
+ "_", |
+ "image", |
+ "_", |
+ ".RAF", |
+ "_", |
+ "image", |
+ "_", |
+ ".RW2", |
+ "_", |
+ "image", |
+ "_", |
+ ".PEF", |
+ "_", |
+ "image", |
+ "_", |
+ ".SRW" |
], |
"env": { |
"ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", |