| Index: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json | 
| diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json | 
| new file mode 100644 | 
| index 0000000000000000000000000000000000000000..70176850aadcad8aee159df1feef431c61a4fc45 | 
| --- /dev/null | 
| +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json | 
| @@ -0,0 +1,230 @@ | 
| +[ | 
| +  { | 
| +    "cmd": [ | 
| +      "python", | 
| +      "-u", | 
| +      "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n", | 
| +      "[CUSTOM_/_B_WORK]", | 
| +      "511" | 
| +    ], | 
| +    "name": "makedirs checkout_path", | 
| +    "~followup_annotations": [ | 
| +      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" % path@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@", | 
| +      "@@@STEP_LOG_END@python.inline@@@" | 
| +    ] | 
| +  }, | 
| +  { | 
| +    "cmd": [ | 
| +      "python", | 
| +      "-u", | 
| +      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", | 
| +      "config", | 
| +      "--spec", | 
| +      "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['llvm']" | 
| +    ], | 
| +    "cwd": "[CUSTOM_/_B_WORK]", | 
| +    "env": { | 
| +      "CHROME_HEADLESS": "1", | 
| +      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| +    }, | 
| +    "name": "gclient setup" | 
| +  }, | 
| +  { | 
| +    "cmd": [ | 
| +      "python", | 
| +      "-u", | 
| +      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", | 
| +      "sync", | 
| +      "--nohooks", | 
| +      "--force", | 
| +      "--verbose", | 
| +      "--delete_unversioned_trees", | 
| +      "--revision", | 
| +      "skia@abc123", | 
| +      "--revision", | 
| +      "src@origin/lkgr", | 
| +      "--output-json", | 
| +      "/path/to/tmp/json" | 
| +    ], | 
| +    "cwd": "[CUSTOM_/_B_WORK]", | 
| +    "env": { | 
| +      "CHROME_HEADLESS": "1", | 
| +      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" | 
| +    }, | 
| +    "name": "gclient sync", | 
| +    "~followup_annotations": [ | 
| +      "@@@STEP_LOG_LINE@json.output@{@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  \"solutions\": {@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"skia/\": {@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@      \"revision\": 164710@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    }, @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"src/\": {@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@      \"revision\": 170242@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    }@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  }@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@}@@@", | 
| +      "@@@STEP_LOG_END@json.output@@@", | 
| +      "@@@SET_BUILD_PROPERTY@got_revision@164710@@@" | 
| +    ] | 
| +  }, | 
| +  { | 
| +    "cmd": [ | 
| +      "python", | 
| +      "-u", | 
| +      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", | 
| +      "runhooks" | 
| +    ], | 
| +    "cwd": "[CUSTOM_/_B_WORK]", | 
| +    "env": { | 
| +      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 
| +    }, | 
| +    "name": "gclient runhooks" | 
| +  }, | 
| +  { | 
| +    "cmd": [ | 
| +      "python", | 
| +      "-u", | 
| +      "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", | 
| +      "/path/to/tmp/json", | 
| +      "Build-Ubuntu-GCC-x86_64-Debug-MSAN" | 
| +    ], | 
| +    "cwd": "[CUSTOM_/_B_WORK]/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@    \"nanobench\"@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  ], @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  \"builder_cfg\": {@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"compiler\": \"GCC\", @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"configuration\": \"Debug\", @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"extra_config\": \"MSAN\", @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"is_trybot\": false, @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"os\": \"Ubuntu\", @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"role\": \"Build\", @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"target_arch\": \"x86_64\"@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  }, @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  \"configuration\": \"Debug\", @@@", | 
| +      "@@@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\": false, @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  \"env\": {@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@    \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", | 
| +      "@@@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@  \"upload_dm_results\": false, @@@", | 
| +      "@@@STEP_LOG_LINE@json.output@  \"upload_perf_results\": false@@@", | 
| +      "@@@STEP_LOG_LINE@json.output@}@@@", | 
| +      "@@@STEP_LOG_END@json.output@@@" | 
| +    ] | 
| +  }, | 
| +  { | 
| +    "cmd": [ | 
| +      "[CUSTOM_/_B_WORK]/skia/tools/xsan_build", | 
| +      "memory", | 
| +      "dm" | 
| +    ], | 
| +    "cwd": "[CUSTOM_/_B_WORK]/skia", | 
| +    "env": { | 
| +      "BUILDTYPE": "Debug", | 
| +      "CHROME_HEADLESS": "1", | 
| +      "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", | 
| +      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", | 
| +      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" | 
| +    }, | 
| +    "name": "build dm" | 
| +  }, | 
| +  { | 
| +    "cmd": [ | 
| +      "[CUSTOM_/_B_WORK]/skia/tools/xsan_build", | 
| +      "memory", | 
| +      "nanobench" | 
| +    ], | 
| +    "cwd": "[CUSTOM_/_B_WORK]/skia", | 
| +    "env": { | 
| +      "BUILDTYPE": "Debug", | 
| +      "CHROME_HEADLESS": "1", | 
| +      "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", | 
| +      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", | 
| +      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" | 
| +    }, | 
| +    "name": "build nanobench" | 
| +  }, | 
| +  { | 
| +    "cmd": [ | 
| +      "python", | 
| +      "-u", | 
| +      "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe']\n\ntry:\n  os.makedirs(dst)\nexcept OSError as e:\n  if e.errno != errno.EEXIST:\n    raise\n\nfor pattern in build_products_whitelist:\n  path = os.path.join(src, pattern)\n  for f in glob.glob(path):\n    dst_path = os.path.join(dst, os.path.relpath(f, src))\n    if not os.path.isdir(os.path.dirname(dst_path)):\n      os.makedirs(os.path.dirname(dst_path))\n    print 'Copying build product %s to %s' % (f, dst_path)\n    shutil.move(f, dst_path)\n", | 
| +      "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN/Debug", | 
| +      "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" | 
| +    ], | 
| +    "name": "copy build products", | 
| +    "~followup_annotations": [ | 
| +      "@@@STEP_LOG_LINE@python.inline@import errno@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@import glob@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@import os@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@import shutil@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@import sys@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe']@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@try:@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@  os.makedirs(dst)@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@  if e.errno != errno.EEXIST:@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@    raise@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@  path = os.path.join(src, pattern)@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@  for f in glob.glob(path):@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@    dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@    if not os.path.isdir(os.path.dirname(dst_path)):@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@      os.makedirs(os.path.dirname(dst_path))@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@    print 'Copying build product %s to %s' % (f, dst_path)@@@", | 
| +      "@@@STEP_LOG_LINE@python.inline@    shutil.move(f, dst_path)@@@", | 
| +      "@@@STEP_LOG_END@python.inline@@@" | 
| +    ] | 
| +  }, | 
| +  { | 
| +    "cmd": [ | 
| +      "python", | 
| +      "-u", | 
| +      "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", | 
| +      "[CUSTOM_/_B_WORK]/skia/third_party/externals/llvm/msan_out", | 
| +      "[CUSTOM_[SWARM_OUT_DIR]]/third_party/externals/llvm/msan_out", | 
| +      "1" | 
| +    ], | 
| +    "name": "copy msan_out" | 
| +  }, | 
| +  { | 
| +    "cmd": [ | 
| +      "python", | 
| +      "-u", | 
| +      "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", | 
| +      "[CUSTOM_/_B_WORK]/src/third_party/llvm-build", | 
| +      "[CUSTOM_[SWARM_OUT_DIR]]/llvm-build", | 
| +      "1" | 
| +    ], | 
| +    "name": "copy llvm-build" | 
| +  }, | 
| +  { | 
| +    "name": "$result", | 
| +    "recipe_result": null, | 
| +    "status_code": 0 | 
| +  } | 
| +] | 
|  |