diff options
Diffstat (limited to 'infra/bots/recipe_modules/perf/example.expected')
26 files changed, 1675 insertions, 1 deletions
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json index a9c3897008..5ebbd535ed 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json @@ -8,6 +8,12 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, @@ -19,6 +25,12 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -70,6 +82,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" @@ -83,6 +101,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -95,6 +119,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, @@ -107,6 +137,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, @@ -118,6 +154,12 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -147,6 +189,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -180,6 +228,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" @@ -193,6 +247,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -205,6 +265,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" }, @@ -217,6 +283,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, @@ -228,6 +300,12 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -257,6 +335,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -290,6 +374,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" @@ -303,6 +393,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -315,6 +411,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, @@ -327,6 +429,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, @@ -338,6 +446,12 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -367,6 +481,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -378,6 +498,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench" }, @@ -389,6 +515,12 @@ "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", "[START_DIR]/tmp/nanobench.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "write nanobench.sh" }, @@ -400,6 +532,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench.sh" }, @@ -410,6 +548,12 @@ "-c" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "clear log" }, @@ -421,6 +565,12 @@ "/data/local/tmp/", "nanobench.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -445,6 +595,12 @@ "\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", "[START_DIR]/out/Debug" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "dump log", "~followup_annotations": [ @@ -472,6 +628,12 @@ "kill-server" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "kill adb server" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json index 70bf858f1e..1758f6bf35 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json @@ -8,6 +8,12 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, @@ -19,6 +25,12 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -70,6 +82,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" @@ -83,6 +101,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -95,6 +119,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, @@ -107,6 +137,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, @@ -118,6 +154,12 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -147,6 +189,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -180,6 +228,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" @@ -193,6 +247,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -205,6 +265,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" }, @@ -217,6 +283,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, @@ -228,6 +300,12 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -257,6 +335,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -290,6 +374,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" @@ -303,6 +393,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -315,6 +411,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, @@ -327,6 +429,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, @@ -338,6 +446,12 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -367,6 +481,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -379,6 +499,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, @@ -391,6 +517,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, @@ -402,6 +534,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench" }, @@ -413,6 +551,12 @@ "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 --nogpu --pre_log --scales 1.0 1.1 --config 8888 nonrendering hwui gles glesmsaa4 glesnvpr4 glesnvprdit4 --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 CPU cpu_or_gpu_value Exynos5250 extra_config Android model Nexus10 os Android; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "write nanobench.sh" }, @@ -424,6 +568,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench.sh" }, @@ -434,6 +584,12 @@ "-c" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "clear log" }, @@ -445,6 +601,12 @@ "/data/local/tmp/", "nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -492,6 +654,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android/data" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android/data" }, @@ -502,6 +670,12 @@ "\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", "[START_DIR]/out/Release" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "dump log", "~followup_annotations": [ @@ -529,6 +703,12 @@ "kill-server" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "kill adb server" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json index b149caf085..6d0157b443 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json @@ -8,6 +8,12 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, @@ -19,6 +25,12 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -70,6 +82,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" @@ -83,6 +101,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -95,6 +119,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, @@ -107,6 +137,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, @@ -118,6 +154,12 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -147,6 +189,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -180,6 +228,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" @@ -193,6 +247,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -205,6 +265,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" }, @@ -217,6 +283,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, @@ -228,6 +300,12 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -257,6 +335,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -290,6 +374,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" @@ -303,6 +393,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -315,6 +411,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, @@ -327,6 +429,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, @@ -338,6 +446,12 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -367,6 +481,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -378,6 +498,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench" }, @@ -389,6 +515,12 @@ "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 nonrendering hwui gles glesmsaa4 glesnvpr4 glesnvprdit4 --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", "[START_DIR]/tmp/nanobench.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "write nanobench.sh" }, @@ -400,6 +532,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench.sh" }, @@ -410,6 +548,12 @@ "-c" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "clear log" }, @@ -421,6 +565,12 @@ "/data/local/tmp/", "nanobench.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -445,6 +595,12 @@ "\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", "[START_DIR]/out/Debug" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "dump log", "~followup_annotations": [ @@ -472,6 +628,12 @@ "kill-server" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "kill adb server" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json index 262df6d10a..fb5f1adbef 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json @@ -8,6 +8,12 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, @@ -19,6 +25,12 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -70,6 +82,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" @@ -83,6 +101,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -95,6 +119,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, @@ -107,6 +137,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, @@ -118,6 +154,12 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -147,6 +189,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -180,6 +228,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" @@ -193,6 +247,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -205,6 +265,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" }, @@ -217,6 +283,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, @@ -228,6 +300,12 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -257,6 +335,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -290,6 +374,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" @@ -303,6 +393,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -315,6 +411,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, @@ -327,6 +429,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, @@ -338,6 +446,12 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -367,6 +481,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -379,6 +499,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, @@ -391,6 +517,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, @@ -402,6 +534,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench" }, @@ -413,6 +551,12 @@ "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 nonrendering hwui gles glesmsaa4 glesnvpr4 glesnvprdit4 glesinst --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", "[START_DIR]/tmp/nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "write nanobench.sh" }, @@ -424,6 +568,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench.sh" }, @@ -434,6 +584,12 @@ "-c" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "clear log" }, @@ -445,6 +601,12 @@ "/data/local/tmp/", "nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -492,6 +654,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android/data" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android/data" }, @@ -502,6 +670,12 @@ "\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", "[START_DIR]/out/Release" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "dump log", "~followup_annotations": [ @@ -529,6 +703,12 @@ "kill-server" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "kill adb server" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json index f8a52b0f54..ab4570f186 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json @@ -8,6 +8,12 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, @@ -19,6 +25,12 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -70,6 +82,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" @@ -83,6 +101,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -95,6 +119,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, @@ -107,6 +137,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, @@ -118,6 +154,12 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -147,6 +189,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -180,6 +228,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" @@ -193,6 +247,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -205,6 +265,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" }, @@ -217,6 +283,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, @@ -228,6 +300,12 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -257,6 +335,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -290,6 +374,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" @@ -303,6 +393,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -315,6 +411,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, @@ -327,6 +429,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, @@ -338,6 +446,12 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -367,6 +481,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -379,6 +499,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, @@ -391,6 +517,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, @@ -402,6 +534,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench" }, @@ -413,6 +551,12 @@ "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 nonrendering hwui gles glesmsaa4 glesnvpr4 glesnvprdit4 --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", "[START_DIR]/tmp/nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "write nanobench.sh" }, @@ -424,6 +568,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench.sh" }, @@ -434,6 +584,12 @@ "-c" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "clear log" }, @@ -445,6 +601,12 @@ "/data/local/tmp/", "nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -492,6 +654,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android/data" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android/data" }, @@ -502,6 +670,12 @@ "\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", "[START_DIR]/out/Release" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "dump log", "~followup_annotations": [ @@ -529,6 +703,12 @@ "kill-server" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "kill adb server" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json index 83400b5f36..2db362aa20 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json @@ -5,6 +5,12 @@ "reboot" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rebooting device" }, @@ -14,6 +20,12 @@ "-u", "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "wait for device", "~followup_annotations": [ @@ -59,6 +71,12 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, @@ -70,6 +88,12 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -121,6 +145,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" @@ -134,6 +164,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -146,6 +182,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, @@ -158,6 +200,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, @@ -169,6 +217,12 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -198,6 +252,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -231,6 +291,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" @@ -244,6 +310,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -256,6 +328,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" }, @@ -268,6 +346,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, @@ -279,6 +363,12 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -308,6 +398,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -341,6 +437,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" @@ -354,6 +456,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -366,6 +474,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, @@ -378,6 +492,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, @@ -389,6 +509,12 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -418,6 +544,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -430,6 +562,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, @@ -442,6 +580,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, @@ -453,6 +597,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench" }, @@ -464,6 +614,12 @@ "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 nonrendering hwui f16 srgb gles --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", "[START_DIR]/tmp/nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "write nanobench.sh" }, @@ -475,6 +631,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench.sh" }, @@ -485,6 +647,12 @@ "-c" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "clear log" }, @@ -496,6 +664,12 @@ "/data/local/tmp/", "nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -543,6 +717,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android/data" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android/data" }, @@ -553,6 +733,12 @@ "\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", "[START_DIR]/out/Release" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "dump log", "~followup_annotations": [ @@ -580,6 +766,12 @@ "kill-server" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "kill adb server" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json index 57a9c20243..eb9c0ba1af 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json @@ -5,6 +5,12 @@ "reboot" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rebooting device" }, @@ -14,6 +20,12 @@ "-u", "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "wait for device", "~followup_annotations": [ @@ -59,6 +71,12 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, @@ -70,6 +88,12 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -121,6 +145,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" @@ -134,6 +164,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -146,6 +182,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, @@ -158,6 +200,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, @@ -169,6 +217,12 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -198,6 +252,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -231,6 +291,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" @@ -244,6 +310,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -256,6 +328,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" }, @@ -268,6 +346,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, @@ -279,6 +363,12 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -308,6 +398,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -341,6 +437,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" @@ -354,6 +456,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -366,6 +474,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, @@ -378,6 +492,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, @@ -389,6 +509,12 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -418,6 +544,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -430,6 +562,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, @@ -442,6 +580,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, @@ -453,6 +597,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench" }, @@ -464,6 +614,12 @@ "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 --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config vk --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~hardstop ~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_Vulkan model NexusPlayer os Android; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "write nanobench.sh" }, @@ -475,6 +631,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench.sh" }, @@ -485,6 +647,12 @@ "-c" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "clear log" }, @@ -496,6 +664,12 @@ "/data/local/tmp/", "nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -543,6 +717,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan/data" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan/data" }, @@ -553,6 +733,12 @@ "\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", "[START_DIR]/out/Release" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "dump log", "~followup_annotations": [ @@ -580,6 +766,12 @@ "kill-server" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "kill adb server" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json index ce0f41b930..be6c2411db 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json @@ -5,6 +5,12 @@ "reboot" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rebooting device" }, @@ -14,6 +20,12 @@ "-u", "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "wait for device", "~followup_annotations": [ @@ -59,6 +71,12 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, @@ -70,6 +88,12 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -121,6 +145,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" @@ -134,6 +164,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -146,6 +182,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, @@ -158,6 +200,12 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, @@ -169,6 +217,12 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -198,6 +252,12 @@ "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, @@ -231,6 +291,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" @@ -244,6 +310,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -256,6 +328,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" }, @@ -268,6 +346,12 @@ "/sdcard/revenge_of_the_skiabot/images" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, @@ -279,6 +363,12 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -308,6 +398,12 @@ "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, @@ -341,6 +437,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" @@ -354,6 +456,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -366,6 +474,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, @@ -378,6 +492,12 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, @@ -389,6 +509,12 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -418,6 +544,12 @@ "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, @@ -430,6 +562,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, @@ -442,6 +580,12 @@ "/sdcard/revenge_of_the_skiabot/perf" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, @@ -453,6 +597,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench" }, @@ -464,6 +614,12 @@ "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 nonrendering hwui f16 srgb gles glesmsaa4 glesnvpr4 glesnvprdit4 glesinst glesinst4 --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", "[START_DIR]/tmp/nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "write nanobench.sh" }, @@ -475,6 +631,12 @@ "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push nanobench.sh" }, @@ -485,6 +647,12 @@ "-c" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "clear log" }, @@ -496,6 +664,12 @@ "/data/local/tmp/", "nanobench.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -543,6 +717,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android/data" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android/data" }, @@ -553,6 +733,12 @@ "\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", "[START_DIR]/out/Release" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "dump log", "~followup_annotations": [ @@ -580,6 +766,12 @@ "kill-server" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "kill adb server" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json index d49bf89ac7..51754021e8 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json @@ -177,6 +177,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 915fe648c0..b3b4a51827 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -111,6 +111,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json index 79a08db96f..86d489888c 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json @@ -182,6 +182,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json index 24ddc96fbf..832ac4372b 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json @@ -186,6 +186,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index ae3d7b67f1..0bcd650884 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -130,6 +130,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json index b3b528611c..de273445ee 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json @@ -132,6 +132,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json index 9d44e71f1d..b939b629ef 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -118,7 +118,7 @@ "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_sdk/lib:[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", - "PATH": "%(PATH)s:[START_DIR]/linux_vulkan_sdk/bin", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json index b335afc8b7..445f265ced 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json @@ -183,6 +183,7 @@ "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_release", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_release", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index 3f106bf38c..bd59f4e70e 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -117,6 +117,7 @@ "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index 564470936c..4c388cc306 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -174,6 +174,7 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json index df09733fd2..37898dc67a 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json @@ -180,6 +180,7 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 2b4d99a44c..1c5a937fa9 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -120,6 +120,7 @@ "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index 72ea825217..7239fb482f 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -182,6 +182,7 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index c4bd59ebf6..fd7807fff2 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -5,6 +5,13 @@ "[START_DIR]/skia/resources", "resources" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "push_if_needed [START_DIR]/skia/resources" }, { @@ -15,6 +22,9 @@ "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], + "env": { + "IOS_BUNDLE_ID": "com.google.nanobench" + }, "infra_step": true, "name": "Get downloaded SKP VERSION" }, @@ -26,6 +36,9 @@ "42", "[START_DIR]/tmp/SKP_VERSION" ], + "env": { + "IOS_BUNDLE_ID": "com.google.nanobench" + }, "infra_step": true, "name": "write SKP_VERSION" }, @@ -34,6 +47,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "tmp/SKP_VERSION" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "cat_file tmp/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -42,6 +62,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SKP_VERSION" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "rm tmp/SKP_VERSION" }, { @@ -49,6 +76,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skps" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "rm skps" }, { @@ -56,6 +90,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skps" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "mkdir skps" }, { @@ -64,6 +105,13 @@ "[START_DIR]/skp", "skps" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "push_if_needed [START_DIR]/skp" }, { @@ -72,6 +120,13 @@ "[START_DIR]/tmp/SKP_VERSION", "tmp/SKP_VERSION" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "push_file [START_DIR]/tmp/SKP_VERSION" }, { @@ -82,6 +137,9 @@ "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], + "env": { + "IOS_BUNDLE_ID": "com.google.nanobench" + }, "infra_step": true, "name": "Get downloaded skimage VERSION" }, @@ -93,6 +151,9 @@ "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], + "env": { + "IOS_BUNDLE_ID": "com.google.nanobench" + }, "infra_step": true, "name": "write SK_IMAGE_VERSION" }, @@ -101,6 +162,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "tmp/SK_IMAGE_VERSION" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "cat_file tmp/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -109,6 +177,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SK_IMAGE_VERSION" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "rm tmp/SK_IMAGE_VERSION" }, { @@ -116,6 +191,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "images" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "rm images" }, { @@ -123,6 +205,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "images" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "mkdir images" }, { @@ -131,6 +220,13 @@ "[START_DIR]/skimage", "images" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "push_if_needed [START_DIR]/skimage" }, { @@ -139,6 +235,13 @@ "[START_DIR]/tmp/SK_IMAGE_VERSION", "tmp/SK_IMAGE_VERSION" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" }, { @@ -149,6 +252,9 @@ "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], + "env": { + "IOS_BUNDLE_ID": "com.google.nanobench" + }, "infra_step": true, "name": "Get downloaded SVG VERSION" }, @@ -160,6 +266,9 @@ "42", "[START_DIR]/tmp/SVG_VERSION" ], + "env": { + "IOS_BUNDLE_ID": "com.google.nanobench" + }, "infra_step": true, "name": "write SVG_VERSION" }, @@ -168,6 +277,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "tmp/SVG_VERSION" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "cat_file tmp/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -176,6 +292,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SVG_VERSION" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "rm tmp/SVG_VERSION" }, { @@ -183,6 +306,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "svgs" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "rm svgs" }, { @@ -190,6 +320,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "svgs" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "mkdir svgs" }, { @@ -198,6 +335,13 @@ "[START_DIR]/svg", "svgs" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "push_if_needed [START_DIR]/svg" }, { @@ -206,6 +350,13 @@ "[START_DIR]/tmp/SVG_VERSION", "tmp/SVG_VERSION" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "push_file [START_DIR]/tmp/SVG_VERSION" }, { @@ -213,6 +364,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "perf" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "rm perf" }, { @@ -220,6 +378,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "perf" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "mkdir perf" }, { @@ -233,6 +398,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -251,6 +417,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" @@ -263,6 +430,9 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data", "511" ], + "env": { + "IOS_BUNDLE_ID": "com.google.nanobench" + }, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -283,6 +453,13 @@ "perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.nanobench", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "pull_if_needed perf" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json b/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json index eb2bed968d..4e9989b5c7 100644 --- a/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json +++ b/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json @@ -182,6 +182,7 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/failed_push.json b/infra/bots/recipe_modules/perf/example.expected/failed_push.json index 5f7f94feeb..9b124572cc 100644 --- a/infra/bots/recipe_modules/perf/example.expected/failed_push.json +++ b/infra/bots/recipe_modules/perf/example.expected/failed_push.json @@ -5,6 +5,12 @@ "reboot" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "rebooting device" }, @@ -14,6 +20,12 @@ "-u", "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "wait for device", "~followup_annotations": [ @@ -59,6 +71,12 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, @@ -70,6 +88,12 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -100,6 +124,12 @@ "\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", "[START_DIR]/out/Debug" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "dump log", "~followup_annotations": [ @@ -129,6 +159,12 @@ "-p" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "shut down device to quarantine bot" }, @@ -138,6 +174,12 @@ "kill-server" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "kill adb server" }, diff --git a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json index 6cb6ce2f77..e91667a76e 100644 --- a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json +++ b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json @@ -216,6 +216,7 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" diff --git a/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json index bd9e1924dd..e005777261 100644 --- a/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json @@ -153,6 +153,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" |