diff options
| author |  Ravi Mistry <rmistry@google.com> | 2016-11-21 16:06:19 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-22 12:36:17 +0000 |
| commit | 9bcca6a2124b60ce9fab18ba697b28fc6a1354db (patch) | |
| tree | baca6579b9b011c6930b9324d55d7b8ed2e52255 /infra/bots/recipes/swarm_perf.expected | |
| parent | 759ae5639b0dfe5a0d5491aa0e0b9855aa42ab73 (diff) | |
Roll recipe DEPS
Looks like slave_build and cwd changed to start_dir in https://bugs.chromium.org/p/chromium/issues/detail?id=662586
BUG=skia:5979
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5104
Change-Id: I46d080b9089ea9b4adc2ed45fc81fdc192bdb2b2
Reviewed-on: https://skia-review.googlesource.com/5104
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'infra/bots/recipes/swarm_perf.expected')
19 files changed, 548 insertions, 548 deletions
diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json index 7c3a3324dd..4c222d112c 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,20 +342,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -364,7 +364,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config vk --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -372,10 +372,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -384,7 +384,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -417,7 +417,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -444,7 +444,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json index a4231d116a..199abf21f0 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,20 +342,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -364,7 +364,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -372,10 +372,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -384,7 +384,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -417,7 +417,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -444,7 +444,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json index 6261e8a83f..f6101b463a 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, { @@ -367,17 +367,17 @@ "-p", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -386,7 +386,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 esinst --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -394,10 +394,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -406,7 +406,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -463,7 +463,7 @@ "/sdcard/revenge_of_the_skiabot/perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android/data" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android/data" }, { @@ -471,7 +471,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -498,7 +498,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json index 2bc3f73912..e847a237d6 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, { @@ -367,17 +367,17 @@ "-p", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -386,7 +386,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -394,10 +394,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -406,7 +406,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -463,7 +463,7 @@ "/sdcard/revenge_of_the_skiabot/perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android/data" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android/data" }, { @@ -471,7 +471,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -498,7 +498,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json index 2b389c488b..c4228de6c1 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, { @@ -367,17 +367,17 @@ "-p", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -386,7 +386,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch x86 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config GN_Android model NexusPlayer os Android; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -394,10 +394,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -406,7 +406,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -463,7 +463,7 @@ "/sdcard/revenge_of_the_skiabot/perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android/data" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android/data" }, { @@ -471,7 +471,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -498,7 +498,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json index 3982f1b924..35b20726c3 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, { @@ -367,17 +367,17 @@ "-p", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -386,7 +386,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 esinst esinst4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model PixelC os Android; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -394,10 +394,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -406,7 +406,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -463,7 +463,7 @@ "/sdcard/revenge_of_the_skiabot/perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android/data" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android/data" }, { @@ -471,7 +471,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -498,7 +498,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json index 3e9ac92d65..9492e955a7 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -105,16 +105,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--nogpu", "--pre_log", "--scales", @@ -175,7 +175,7 @@ "os", "Mac" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 511830121f..16a2734c6e 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--nocpu", "--pre_log", "--images", @@ -102,7 +102,7 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json index e4f72c83f2..3b4b94c675 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -106,16 +106,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--nogpu", "--pre_log", "--scales", @@ -175,7 +175,7 @@ "os", "Ubuntu" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json index c7153204e9..7eda498082 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE/data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -106,16 +106,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--nocpu", "--pre_log", "--images", @@ -179,7 +179,7 @@ "os", "Ubuntu" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 026a9f6e0f..ff596e3b53 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,15 +67,15 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/nanobench", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--nocpu", "--pre_log", "--images", @@ -124,7 +124,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -136,15 +136,15 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/nanobench", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--nocpu", "--pre_log", "--images", @@ -195,7 +195,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench --abandonGpuContext" }, diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index 4ec83b4f04..f3fd6492cb 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Debug_x64\\nanobench", + "[START_DIR]\\out\\Debug_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nogpu", "--pre_log", "--scales", @@ -108,7 +108,7 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index 82f3901a1d..9a94744ff1 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -105,16 +105,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nogpu", "--pre_log", "--scales", @@ -172,7 +172,7 @@ "os", "Win" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index fdaab65cb6..3e02cdd9f1 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Debug_x64\\nanobench", + "[START_DIR]\\out\\Debug_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nocpu", "--pre_log", "--images", @@ -111,7 +111,7 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index d5a1e55be4..c743570a0f 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -105,16 +105,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nocpu", "--pre_log", "--images", @@ -180,7 +180,7 @@ "os", "Win8" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index a8ea9cbffd..a5c89e7611 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -1,27 +1,27 @@ [ { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_install" + "[START_DIR]/skia/platform_tools/ios/bin/ios_install" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "install iOSShell" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skia/resources", "skiabot/skia_resources" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push resources to skia_resources" }, @@ -30,7 +30,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -41,97 +41,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SKP_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skp", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skp to skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SKP_VERSION", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION" + "name": "push [START_DIR]/tmp/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -142,97 +142,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skimage", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skimage to skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -243,94 +243,94 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SVG_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/svg", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/svg", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push svg to svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SVG_VERSION", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION" + "name": "push [START_DIR]/tmp/SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_run_skia", + "[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia", "--nanobench", "--undefok", "-i", @@ -391,20 +391,20 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "nanobench" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_restart" + "[START_DIR]/skia/platform_tools/ios/bin/ios_restart" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "reboot" }, @@ -416,8 +416,8 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "wait for reboot" }, diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json index 66bc931f6a..2817618709 100644 --- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -105,16 +105,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nocpu", "--pre_log", "--images", @@ -180,7 +180,7 @@ "os", "Win8" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/nobuildbot.json b/infra/bots/recipes/swarm_perf.expected/nobuildbot.json index 5792a79834..01b485bc21 100644 --- a/infra/bots/recipes/swarm_perf.expected/nobuildbot.json +++ b/infra/bots/recipes/swarm_perf.expected/nobuildbot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -133,16 +133,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nocpu", "--pre_log", "--images", @@ -214,7 +214,7 @@ "os", "Win8" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json index 7aacca786f..ed45dac5ab 100644 --- a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json @@ -4,7 +4,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -26,7 +26,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -37,7 +37,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -57,7 +57,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -66,7 +66,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -77,7 +77,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -89,15 +89,15 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/nanobench", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--nocpu", "--pre_log", "--images", @@ -146,7 +146,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -158,15 +158,15 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/nanobench", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--nocpu", "--pre_log", "--images", @@ -217,7 +217,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench --abandonGpuContext" }, |