| Index: scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot.json | 
| diff --git a/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot.json b/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot.json | 
| deleted file mode 100644 | 
| index 51bfcfb47f3e362ebb12aaea70a21ab7c35e891e..0000000000000000000000000000000000000000 | 
| --- a/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot.json | 
| +++ /dev/null | 
| @@ -1,411 +0,0 @@ | 
| -[ | 
| -  { | 
| -    "cmd": [ | 
| -      "git", | 
| -      "fetch" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]/skia", | 
| -    "name": "git fetch" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "git", | 
| -      "reset", | 
| -      "--hard", | 
| -      "abc123" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]/skia", | 
| -    "name": "git reset" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "git", | 
| -      "clean", | 
| -      "-d", | 
| -      "-f" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]/skia", | 
| -    "name": "git clean" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "[DEPOT_TOOLS]/gclient.py", | 
| -      "config", | 
| -      "--spec", | 
| -      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "gclient setup" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "[BUILD]/scripts/slave/gclient_safe_revert.py", | 
| -      ".", | 
| -      "[DEPOT_TOOLS]/gclient" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "gclient revert" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "[DEPOT_TOOLS]/gclient.py", | 
| -      "sync", | 
| -      "--nohooks", | 
| -      "--force", | 
| -      "--verbose", | 
| -      "--delete_unversioned_trees", | 
| -      "--revision", | 
| -      "skia@abc123", | 
| -      "--output-json", | 
| -      "/path/to/tmp/json" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "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@  }@@@", | 
| -      "@@@STEP_LOG_LINE@json.output@}@@@", | 
| -      "@@@STEP_LOG_END@json.output@@@", | 
| -      "@@@SET_BUILD_PROPERTY@got_revision@164710@@@" | 
| -    ] | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "[DEPOT_TOOLS]/apply_issue.py", | 
| -      "-r", | 
| -      "[SLAVE_BUILD]/skia", | 
| -      "-i", | 
| -      "500", | 
| -      "-p", | 
| -      "1", | 
| -      "-s", | 
| -      "https://codereview.chromium.org", | 
| -      "--no-auth" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "apply_issue", | 
| -    "~followup_annotations": [ | 
| -      "@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@" | 
| -    ] | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "\nimport os\nimport sys\nwith open(sys.argv[1], 'w') as f:\n  f.write(os.path.join(os.path.expanduser('~'), 'src'))\n", | 
| -      "/path/to/tmp/" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "get CHROME_PATH", | 
| -    "~followup_annotations": [ | 
| -      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@import os@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@import sys@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@  f.write(os.path.join(os.path.expanduser('~'), 'src'))@@@", | 
| -      "@@@STEP_LOG_END@python.inline@@@" | 
| -    ] | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "make", | 
| -      "dm", | 
| -      "BUILDTYPE=Debug" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]/skia", | 
| -    "env": { | 
| -      "CHROME_PATH": "/home/chrome-bot/src", | 
| -      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_gpu=0 skia_warnings_as_errors=0" | 
| -    }, | 
| -    "name": "build dm" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "make", | 
| -      "nanobench", | 
| -      "BUILDTYPE=Debug" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]/skia", | 
| -    "env": { | 
| -      "CHROME_PATH": "/home/chrome-bot/src", | 
| -      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_gpu=0 skia_warnings_as_errors=0" | 
| -    }, | 
| -    "name": "build nanobench" | 
| -  }, | 
| -  { | 
| -    "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", | 
| -      "[SLAVE_BUILD]/tmp", | 
| -      "511" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "makedirs tmp_dir", | 
| -    "~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", | 
| -      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", | 
| -      "[SLAVE_BUILD]/skia/SKP_VERSION", | 
| -      "/path/to/tmp/" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "Get expected SKP_VERSION" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", | 
| -      "[SLAVE_BUILD]/tmp/SKP_VERSION", | 
| -      "/path/to/tmp/" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "Get downloaded SKP_VERSION" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py", | 
| -      "--", | 
| -      "[DEPOT_TOOLS]/gsutil.py", | 
| -      "--force-version", | 
| -      "3.25", | 
| -      "----", | 
| -      "cat", | 
| -      "gs://chromium-skia-gm/skimage/input/TIMESTAMP_LAST_UPLOAD_COMPLETED" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED", | 
| -    "stdout": "/path/to/tmp/" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", | 
| -      "[SLAVE_BUILD]/tmp/SKIMAGE_VERSION", | 
| -      "/path/to/tmp/" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "Get downloaded SKIMAGE_VERSION" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "\nimport os, sys\nfrom common import chromium_utils\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n", | 
| -      "[SLAVE_BUILD]/dm" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "rmtree dm", | 
| -    "~followup_annotations": [ | 
| -      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@  chromium_utils.RemoveDirectory(sys.argv[1])@@@", | 
| -      "@@@STEP_LOG_END@python.inline@@@" | 
| -    ] | 
| -  }, | 
| -  { | 
| -    "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", | 
| -      "[SLAVE_BUILD]/dm", | 
| -      "511" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "makedirs dm", | 
| -    "~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", | 
| -      "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/2/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n  try:\n    with contextlib.closing(\n        urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n      hashes = w.read()\n      with open(sys.argv[1], 'w') as f:\n        f.write(hashes)\n        break\n  except:\n    print 'Failed to get uninteresting hashes from %s' % HASHES_URL\n    if retry == RETRIES:\n      raise\n    waittime = WAIT_BASE * math.pow(2, retry)\n    print 'Retry in %d seconds.' % waittime\n    time.sleep(waittime)\n", | 
| -      "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]/skia", | 
| -    "name": "get uninteresting hashes", | 
| -    "~followup_annotations": [ | 
| -      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@import contextlib@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@import math@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@import socket@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@import sys@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@import time@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://gold.skia.org/2/_/hashes'@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@  try:@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@    with contextlib.closing(@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@        urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@      hashes = w.read()@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@      with open(sys.argv[1], 'w') as f:@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@        f.write(hashes)@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@        break@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@  except:@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@    print 'Failed to get uninteresting hashes from %s' % HASHES_URL@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@    if retry == RETRIES:@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@      raise@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@    waittime = WAIT_BASE * math.pow(2, retry)@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@    print 'Retry in %d seconds.' % waittime@@@", | 
| -      "@@@STEP_LOG_LINE@python.inline@    time.sleep(waittime)@@@", | 
| -      "@@@STEP_LOG_END@python.inline@@@" | 
| -    ] | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "[SLAVE_BUILD]/skia/tools/dm_flags.py", | 
| -      "/path/to/tmp/json", | 
| -      "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]/skia", | 
| -    "name": "exec dm_flags.py", | 
| -    "~followup_annotations": [ | 
| -      "@@@STEP_LOG_LINE@json.output@[@@@", | 
| -      "@@@STEP_LOG_LINE@json.output@  \"--dummy-flags\"@@@", | 
| -      "@@@STEP_LOG_LINE@json.output@]@@@", | 
| -      "@@@STEP_LOG_END@json.output@@@" | 
| -    ] | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "catchsegv", | 
| -      "[SLAVE_BUILD]/skia/out/Debug/dm", | 
| -      "--undefok", | 
| -      "--verbose", | 
| -      "--resourcePath", | 
| -      "[SLAVE_BUILD]/skia/resources", | 
| -      "--skps", | 
| -      "[SLAVE_BUILD]/playback/skps", | 
| -      "--images", | 
| -      "[SLAVE_BUILD]/images", | 
| -      "--writePath", | 
| -      "[SLAVE_BUILD]/dm", | 
| -      "--nameByHash", | 
| -      "--properties", | 
| -      "gitHash", | 
| -      "164710", | 
| -      "build_number", | 
| -      "5", | 
| -      "--key", | 
| -      "arch", | 
| -      "x86_64", | 
| -      "compiler", | 
| -      "GCC", | 
| -      "configuration", | 
| -      "Debug", | 
| -      "cpu_or_gpu", | 
| -      "CPU", | 
| -      "cpu_or_gpu_value", | 
| -      "AVX2", | 
| -      "model", | 
| -      "GCE", | 
| -      "os", | 
| -      "Ubuntu", | 
| -      "--uninterestingHashesFile", | 
| -      "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", | 
| -      "--nogpu", | 
| -      "--dummy-flags" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "dm" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "RECIPE_MODULE[skia]/resources/upload_dm_results.py", | 
| -      "[SLAVE_BUILD]/dm", | 
| -      "164710", | 
| -      "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot", | 
| -      "5", | 
| -      "500", | 
| -      "[SLAVE_BUILD]/skia/common/py/utils" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]/skia", | 
| -    "name": "Upload DM Results" | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "python", | 
| -      "-u", | 
| -      "[SLAVE_BUILD]/skia/tools/nanobench_flags.py", | 
| -      "/path/to/tmp/json", | 
| -      "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]/skia", | 
| -    "name": "exec nanobench_flags.py", | 
| -    "~followup_annotations": [ | 
| -      "@@@STEP_LOG_LINE@json.output@[@@@", | 
| -      "@@@STEP_LOG_LINE@json.output@  \"--dummy-flags\"@@@", | 
| -      "@@@STEP_LOG_LINE@json.output@]@@@", | 
| -      "@@@STEP_LOG_END@json.output@@@" | 
| -    ] | 
| -  }, | 
| -  { | 
| -    "cmd": [ | 
| -      "catchsegv", | 
| -      "[SLAVE_BUILD]/skia/out/Debug/nanobench", | 
| -      "--undefok", | 
| -      "-i", | 
| -      "[SLAVE_BUILD]/skia/resources", | 
| -      "--skps", | 
| -      "[SLAVE_BUILD]/playback/skps", | 
| -      "--nogpu", | 
| -      "--dummy-flags" | 
| -    ], | 
| -    "cwd": "[SLAVE_BUILD]", | 
| -    "name": "nanobench" | 
| -  } | 
| -] | 
|  |