| OLD | NEW | 
|---|
|  | (Empty) | 
| 1 [ |  | 
| 2   { |  | 
| 3     "cmd": [ |  | 
| 4       "git.bat", |  | 
| 5       "fetch" |  | 
| 6     ], |  | 
| 7     "cwd": "[SLAVE_BUILD]\\skia", |  | 
| 8     "name": "git fetch" |  | 
| 9   }, |  | 
| 10   { |  | 
| 11     "cmd": [ |  | 
| 12       "git.bat", |  | 
| 13       "reset", |  | 
| 14       "--hard", |  | 
| 15       "abc123" |  | 
| 16     ], |  | 
| 17     "cwd": "[SLAVE_BUILD]\\skia", |  | 
| 18     "name": "git reset" |  | 
| 19   }, |  | 
| 20   { |  | 
| 21     "cmd": [ |  | 
| 22       "git.bat", |  | 
| 23       "clean", |  | 
| 24       "-d", |  | 
| 25       "-f" |  | 
| 26     ], |  | 
| 27     "cwd": "[SLAVE_BUILD]\\skia", |  | 
| 28     "name": "git clean" |  | 
| 29   }, |  | 
| 30   { |  | 
| 31     "cmd": [ |  | 
| 32       "python", |  | 
| 33       "-u", |  | 
| 34       "[DEPOT_TOOLS]\\gclient.py", |  | 
| 35       "config", |  | 
| 36       "--spec", |  | 
| 37       "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'na
     me': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]" |  | 
| 38     ], |  | 
| 39     "cwd": "[SLAVE_BUILD]", |  | 
| 40     "name": "gclient setup" |  | 
| 41   }, |  | 
| 42   { |  | 
| 43     "cmd": [ |  | 
| 44       "python", |  | 
| 45       "-u", |  | 
| 46       "[BUILD]\\scripts\\slave\\gclient_safe_revert.py", |  | 
| 47       ".", |  | 
| 48       "[DEPOT_TOOLS]\\gclient.bat" |  | 
| 49     ], |  | 
| 50     "cwd": "[SLAVE_BUILD]", |  | 
| 51     "name": "gclient revert" |  | 
| 52   }, |  | 
| 53   { |  | 
| 54     "cmd": [ |  | 
| 55       "python", |  | 
| 56       "-u", |  | 
| 57       "[DEPOT_TOOLS]\\gclient.py", |  | 
| 58       "sync", |  | 
| 59       "--nohooks", |  | 
| 60       "--force", |  | 
| 61       "--verbose", |  | 
| 62       "--delete_unversioned_trees", |  | 
| 63       "--revision", |  | 
| 64       "skia@abc123", |  | 
| 65       "--output-json", |  | 
| 66       "/path/to/tmp/json" |  | 
| 67     ], |  | 
| 68     "cwd": "[SLAVE_BUILD]", |  | 
| 69     "name": "gclient sync", |  | 
| 70     "~followup_annotations": [ |  | 
| 71       "@@@STEP_LOG_LINE@json.output@{@@@", |  | 
| 72       "@@@STEP_LOG_LINE@json.output@  \"solutions\": {@@@", |  | 
| 73       "@@@STEP_LOG_LINE@json.output@    \"skia/\": {@@@", |  | 
| 74       "@@@STEP_LOG_LINE@json.output@      \"revision\": 164710@@@", |  | 
| 75       "@@@STEP_LOG_LINE@json.output@    }@@@", |  | 
| 76       "@@@STEP_LOG_LINE@json.output@  }@@@", |  | 
| 77       "@@@STEP_LOG_LINE@json.output@}@@@", |  | 
| 78       "@@@STEP_LOG_END@json.output@@@", |  | 
| 79       "@@@SET_BUILD_PROPERTY@got_revision@164710@@@" |  | 
| 80     ] |  | 
| 81   }, |  | 
| 82   { |  | 
| 83     "cmd": [ |  | 
| 84       "python", |  | 
| 85       "-u", |  | 
| 86       "[DEPOT_TOOLS]\\apply_issue.py", |  | 
| 87       "-r", |  | 
| 88       "[SLAVE_BUILD]\\skia", |  | 
| 89       "-i", |  | 
| 90       "500", |  | 
| 91       "-p", |  | 
| 92       "1", |  | 
| 93       "-s", |  | 
| 94       "https://codereview.chromium.org", |  | 
| 95       "--no-auth" |  | 
| 96     ], |  | 
| 97     "cwd": "[SLAVE_BUILD]", |  | 
| 98     "name": "apply_issue", |  | 
| 99     "~followup_annotations": [ |  | 
| 100       "@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@" |  | 
| 101     ] |  | 
| 102   }, |  | 
| 103   { |  | 
| 104     "cmd": [ |  | 
| 105       "python", |  | 
| 106       "-u", |  | 
| 107       "\nimport os\nimport sys\nwith open(sys.argv[1], 'w') as f:\n  f.write(os.
     path.join(os.path.expanduser('~'), 'src'))\n", |  | 
| 108       "/path/to/tmp/" |  | 
| 109     ], |  | 
| 110     "cwd": "[SLAVE_BUILD]", |  | 
| 111     "name": "get CHROME_PATH", |  | 
| 112     "~followup_annotations": [ |  | 
| 113       "@@@STEP_LOG_LINE@python.inline@@@@", |  | 
| 114       "@@@STEP_LOG_LINE@python.inline@import os@@@", |  | 
| 115       "@@@STEP_LOG_LINE@python.inline@import sys@@@", |  | 
| 116       "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@", |  | 
| 117       "@@@STEP_LOG_LINE@python.inline@  f.write(os.path.join(os.path.expanduser(
     '~'), 'src'))@@@", |  | 
| 118       "@@@STEP_LOG_END@python.inline@@@" |  | 
| 119     ] |  | 
| 120   }, |  | 
| 121   { |  | 
| 122     "cmd": [ |  | 
| 123       "python", |  | 
| 124       "make.py", |  | 
| 125       "nanobench", |  | 
| 126       "BUILDTYPE=Release" |  | 
| 127     ], |  | 
| 128     "cwd": "[SLAVE_BUILD]\\skia", |  | 
| 129     "env": { |  | 
| 130       "CHROME_PATH": "/home/chrome-bot/src", |  | 
| 131       "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_arch_width=32 
     skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp" |  | 
| 132     }, |  | 
| 133     "name": "build nanobench" |  | 
| 134   }, |  | 
| 135   { |  | 
| 136     "cmd": [ |  | 
| 137       "python", |  | 
| 138       "-u", |  | 
| 139       "\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", |  | 
| 140       "[SLAVE_BUILD]\\tmp", |  | 
| 141       "511" |  | 
| 142     ], |  | 
| 143     "cwd": "[SLAVE_BUILD]", |  | 
| 144     "name": "makedirs tmp_dir", |  | 
| 145     "~followup_annotations": [ |  | 
| 146       "@@@STEP_LOG_LINE@python.inline@@@@", |  | 
| 147       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", |  | 
| 148       "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", |  | 
| 149       "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", |  | 
| 150       "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", |  | 
| 151       "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@", |  | 
| 152       "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" %
      path@@@", |  | 
| 153       "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@", |  | 
| 154       "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@", |  | 
| 155       "@@@STEP_LOG_END@python.inline@@@" |  | 
| 156     ] |  | 
| 157   }, |  | 
| 158   { |  | 
| 159     "cmd": [ |  | 
| 160       "python", |  | 
| 161       "-u", |  | 
| 162       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |  | 
| 163       "[SLAVE_BUILD]\\skia\\SKP_VERSION", |  | 
| 164       "/path/to/tmp/" |  | 
| 165     ], |  | 
| 166     "cwd": "[SLAVE_BUILD]", |  | 
| 167     "name": "Get expected SKP_VERSION" |  | 
| 168   }, |  | 
| 169   { |  | 
| 170     "cmd": [ |  | 
| 171       "python", |  | 
| 172       "-u", |  | 
| 173       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |  | 
| 174       "[SLAVE_BUILD]\\tmp\\SKP_VERSION", |  | 
| 175       "/path/to/tmp/" |  | 
| 176     ], |  | 
| 177     "cwd": "[SLAVE_BUILD]", |  | 
| 178     "name": "Get downloaded SKP_VERSION" |  | 
| 179   }, |  | 
| 180   { |  | 
| 181     "cmd": [ |  | 
| 182       "python", |  | 
| 183       "-u", |  | 
| 184       "\nimport os, sys\nfrom common import chromium_utils\n\nif os.path.exists(
     sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n", |  | 
| 185       "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-T
     rybot\\data" |  | 
| 186     ], |  | 
| 187     "cwd": "[SLAVE_BUILD]", |  | 
| 188     "name": "rmtree data", |  | 
| 189     "~followup_annotations": [ |  | 
| 190       "@@@STEP_LOG_LINE@python.inline@@@@", |  | 
| 191       "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", |  | 
| 192       "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils@@@", |  | 
| 193       "@@@STEP_LOG_LINE@python.inline@@@@", |  | 
| 194       "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", |  | 
| 195       "@@@STEP_LOG_LINE@python.inline@  chromium_utils.RemoveDirectory(sys.argv[
     1])@@@", |  | 
| 196       "@@@STEP_LOG_END@python.inline@@@" |  | 
| 197     ] |  | 
| 198   }, |  | 
| 199   { |  | 
| 200     "cmd": [ |  | 
| 201       "python", |  | 
| 202       "-u", |  | 
| 203       "\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", |  | 
| 204       "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-T
     rybot\\data", |  | 
| 205       "511" |  | 
| 206     ], |  | 
| 207     "cwd": "[SLAVE_BUILD]", |  | 
| 208     "name": "makedirs data", |  | 
| 209     "~followup_annotations": [ |  | 
| 210       "@@@STEP_LOG_LINE@python.inline@@@@", |  | 
| 211       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", |  | 
| 212       "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", |  | 
| 213       "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", |  | 
| 214       "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", |  | 
| 215       "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@", |  | 
| 216       "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" %
      path@@@", |  | 
| 217       "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@", |  | 
| 218       "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@", |  | 
| 219       "@@@STEP_LOG_END@python.inline@@@" |  | 
| 220     ] |  | 
| 221   }, |  | 
| 222   { |  | 
| 223     "cmd": [ |  | 
| 224       "python", |  | 
| 225       "-u", |  | 
| 226       "[SLAVE_BUILD]\\skia\\tools/nanobench_flags.py", |  | 
| 227       "/path/to/tmp/json", |  | 
| 228       "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot" |  | 
| 229     ], |  | 
| 230     "cwd": "[SLAVE_BUILD]\\skia", |  | 
| 231     "name": "exec nanobench_flags.py", |  | 
| 232     "~followup_annotations": [ |  | 
| 233       "@@@STEP_LOG_LINE@json.output@[@@@", |  | 
| 234       "@@@STEP_LOG_LINE@json.output@  \"--dummy-flags\"@@@", |  | 
| 235       "@@@STEP_LOG_LINE@json.output@]@@@", |  | 
| 236       "@@@STEP_LOG_END@json.output@@@" |  | 
| 237     ] |  | 
| 238   }, |  | 
| 239   { |  | 
| 240     "cmd": [ |  | 
| 241       "[DEPOT_TOOLS]\\git.bat", |  | 
| 242       "show", |  | 
| 243       "HEAD", |  | 
| 244       "--format=%at", |  | 
| 245       "-s" |  | 
| 246     ], |  | 
| 247     "cwd": "[SLAVE_BUILD]\\skia", |  | 
| 248     "name": "git show", |  | 
| 249     "stdout": "/path/to/tmp/" |  | 
| 250   }, |  | 
| 251   { |  | 
| 252     "cmd": [ |  | 
| 253       "[SLAVE_BUILD]\\skia\\out\\Release\\nanobench", |  | 
| 254       "--undefok", |  | 
| 255       "-i", |  | 
| 256       "[SLAVE_BUILD]\\skia\\resources", |  | 
| 257       "--skps", |  | 
| 258       "[SLAVE_BUILD]\\playback\\skps", |  | 
| 259       "--nocpu", |  | 
| 260       "--dummy-flags", |  | 
| 261       "--outResultsFile", |  | 
| 262       "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-T
     rybot\\data\\nanobench_164710_1408633190.json", |  | 
| 263       "--properties", |  | 
| 264       "gitHash", |  | 
| 265       "164710", |  | 
| 266       "build_number", |  | 
| 267       "5", |  | 
| 268       "--key", |  | 
| 269       "arch", |  | 
| 270       "x86", |  | 
| 271       "compiler", |  | 
| 272       "MSVC", |  | 
| 273       "cpu_or_gpu", |  | 
| 274       "GPU", |  | 
| 275       "cpu_or_gpu_value", |  | 
| 276       "HD2000", |  | 
| 277       "model", |  | 
| 278       "ShuttleA", |  | 
| 279       "os", |  | 
| 280       "Win7" |  | 
| 281     ], |  | 
| 282     "cwd": "[SLAVE_BUILD]", |  | 
| 283     "name": "nanobench" |  | 
| 284   }, |  | 
| 285   { |  | 
| 286     "cmd": [ |  | 
| 287       "python", |  | 
| 288       "-u", |  | 
| 289       "RECIPE_MODULE[skia]\\resources\\upload_bench_results.py", |  | 
| 290       "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot", |  | 
| 291       "5", |  | 
| 292       "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-T
     rybot\\data", |  | 
| 293       "164710", |  | 
| 294       "[DEPOT_TOOLS]\\third_party\\gsutil\\gsutil", |  | 
| 295       "500" |  | 
| 296     ], |  | 
| 297     "cwd": "[SLAVE_BUILD]\\skia", |  | 
| 298     "name": "Upload Nanobench Results" |  | 
| 299   } |  | 
| 300 ] |  | 
| OLD | NEW | 
|---|