diff options
151 files changed, 6063 insertions, 370 deletions
diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json index 21c42fb346..e87319b97a 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json index acc3651e73..fac2e5f272 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -87,8 +84,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android" }, "infra_step": true, "name": "fetch-gn" @@ -102,8 +103,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android" }, "name": "gn gen" }, @@ -115,8 +120,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 18661405d1..95e32925f9 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -45,12 +45,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -109,8 +106,12 @@ "--make-output-dir" ], "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "build command_buffer" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json index c66ac778f2..4852df65f2 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json index fa05bde932..580bee6094 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json @@ -49,12 +49,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -93,8 +90,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" }, "infra_step": true, "name": "fetch-gn" @@ -108,8 +109,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" }, "name": "gn gen" }, @@ -121,8 +126,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json index ea838cd1f6..89ab1a2a65 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -87,8 +84,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" }, "infra_step": true, "name": "fetch-gn" @@ -102,8 +103,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" }, "name": "gn gen" }, @@ -115,8 +120,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json index 34e8f5c15d..5e9b82a365 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -87,8 +84,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Release", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android" }, "infra_step": true, "name": "fetch-gn" @@ -102,8 +103,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Release", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android" }, "name": "gn gen" }, @@ -115,8 +120,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Release", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json index 6b6dc16fe2..f51b38af56 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -87,8 +84,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Release", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan" }, "infra_step": true, "name": "fetch-gn" @@ -102,8 +103,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Release", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan" }, "name": "gn gen" }, @@ -115,8 +120,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Release", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index c163c0408f..4953d236dc 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json index fa243d5ba7..337d684d01 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json index 6a30ea1412..8cf5550e64 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Mini" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json index 234bcfec18..bb048a9221 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json index 4f42cebab6..03e93935d3 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-arm-Release-Chromecast" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -86,6 +83,12 @@ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-arm-Release-Chromecast" + }, "infra_step": true, "name": "fetch-gn" }, @@ -97,6 +100,12 @@ "--args=ar=\"[START_DIR]/cast_toolchain/bin/armv7a-cros-linux-gnueabi-ar\" cc=\"[START_DIR]/cast_toolchain/bin/armv7a-cros-linux-gnueabi-gcc\" cxx=\"[START_DIR]/cast_toolchain/bin/armv7a-cros-linux-gnueabi-g++\" extra_cflags=[\"-g0\"] extra_ldflags=[\"-static-libstdc++\", \"-static-libgcc\"] is_debug=false skia_enable_gpu=false skia_use_fontconfig=false skia_use_icu=false skia_use_system_freetype2=false target_cpu=\"arm\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-arm-Release-Chromecast" + }, "name": "gn gen" }, { @@ -107,6 +116,12 @@ "nanobench" ], "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-arm-Release-Chromecast" + }, "name": "ninja" }, { diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json index 323d9b12ed..63b45a2f41 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index 867f3c7e8d..673cedc024 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index 3aadc37d11..05368fc919 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index b0c6196f75..27f99bae28 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 235b86c3c0..0be09bd434 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index 739fb13a24..daf8db144f 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index 52d763c7a4..2639a71b2e 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json index 2d9113075e..de42588f23 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -45,12 +45,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]/flutter", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -96,6 +93,12 @@ "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + }, "name": "runhook" }, { @@ -106,6 +109,7 @@ "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, @@ -118,6 +122,13 @@ "--runtime-mode=release", "--android" ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + }, "name": "gn_gen" }, { @@ -127,6 +138,13 @@ "out/android_release", "-j100" ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + }, "name": "build_flutter" }, { diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index 13302126ce..b58b46037a 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json index 4ea7fa1fb8..18130ce9e8 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -45,12 +45,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -97,6 +94,12 @@ "gn_linux64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + }, "name": "runhook" }, { @@ -106,6 +109,12 @@ "--arch=amd64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + }, "name": "sysroot" }, { @@ -117,7 +126,11 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, "name": "gn_gen" }, @@ -130,7 +143,11 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, "name": "build_pdfium" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json index 0fce3fbe5c..dcb4e3a054 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json @@ -45,12 +45,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -97,6 +94,12 @@ "gn_linux64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths" + }, "name": "runhook" }, { @@ -106,6 +109,12 @@ "--arch=amd64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths" + }, "name": "sysroot" }, { @@ -117,7 +126,11 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths" }, "name": "gn_gen" }, @@ -130,7 +143,11 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths" }, "name": "build_pdfium" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json index 705b0b3da4..698d7ceb8a 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json index 394db6d34d..073647d6db 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-Clang-arm64-Release-GN_Android.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-Clang-arm64-Release-GN_Android.json index 194fb43e34..a6e75c3f74 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-Clang-arm64-Release-GN_Android.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-Clang-arm64-Release-GN_Android.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-GN_Android" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -87,8 +84,12 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { + "BUILDTYPE": "Release", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-GN_Android" }, "infra_step": true, "name": "fetch-gn" @@ -102,8 +103,12 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { + "BUILDTYPE": "Release", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-GN_Android" }, "name": "gn gen" }, @@ -115,8 +120,12 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { + "BUILDTYPE": "Release", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-GN_Android" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index 173ff9f17e..7f212a3a1d 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 2a93115b1a..64c359e25a 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json index ba32bc6c00..bb1bdf64ba 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json index d1f8dc12c9..0edfd92e6b 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json index 4233a6e9c5..37c123c444 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index a5cc98d586..17f73f603f 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json b/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json index 923f3de07f..b9fd3b5737 100644 --- a/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json +++ b/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json b/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json index 77b7b53622..2ed2b3687f 100644 --- a/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json +++ b/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json @@ -49,12 +49,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json index c7197d15ab..6d6fe0388d 100644 --- a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json +++ b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json @@ -47,12 +47,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json index 7bb68d2b22..b0638a1146 100644 --- a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json +++ b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json @@ -49,12 +49,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json b/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json index e6aebf3e78..713791f8b2 100644 --- a/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json +++ b/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json @@ -49,12 +49,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]/flutter", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -100,6 +97,12 @@ "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + }, "name": "runhook" }, { @@ -110,6 +113,7 @@ "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, @@ -122,6 +126,13 @@ "--runtime-mode=release", "--android" ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + }, "name": "gn_gen" }, { @@ -131,6 +142,13 @@ "out/android_release", "-j100" ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" + }, "name": "build_flutter" }, { diff --git a/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json b/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json index 1899d01efd..5d2e072314 100644 --- a/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json +++ b/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json @@ -49,12 +49,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -101,6 +98,12 @@ "gn_linux64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + }, "name": "runhook" }, { @@ -110,6 +113,12 @@ "--arch=amd64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + }, "name": "sysroot" }, { @@ -121,7 +130,11 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, "name": "gn_gen" }, @@ -134,7 +147,11 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, "name": "build_pdfium" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json index 79257cc00b..1c72f6d0b3 100644 --- a/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json @@ -47,12 +47,9 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py index 5df07e2e06..623189183c 100644 --- a/infra/bots/recipe_modules/core/api.py +++ b/infra/bots/recipe_modules/core/api.py @@ -153,8 +153,7 @@ class SkiaApi(recipe_api.RecipeApi): ) self.m.gclient.c = gclient_cfg - with self.m.step.context({'cwd': self.m.vars.checkout_root, - 'env': self.m.vars.default_env}): + with self.m.step.context({'cwd': self.m.vars.checkout_root}): update_step = self.m.bot_update.ensure_checkout(patch_root=patch_root) self.m.vars.got_revision = ( diff --git a/infra/bots/recipe_modules/flavor/flutter_flavor.py b/infra/bots/recipe_modules/flavor/flutter_flavor.py index be3a9f0962..0f0302b20e 100644 --- a/infra/bots/recipe_modules/flavor/flutter_flavor.py +++ b/infra/bots/recipe_modules/flavor/flutter_flavor.py @@ -21,32 +21,31 @@ class FlutterFlavorUtils(default_flavor.DefaultFlavorUtils): out_dir = configuration with self.m.step.context({'cwd': flutter_dir}): - # Runhook to generate the gn binary in buildtools. self.m.run( self.m.step, 'runhook', cmd=['gclient', 'runhooks']) - # Setup GN args. - gn_args = [ - '--runtime-mode=%s' % configuration, - ] - if 'Android' in extra_config: - gn_args.append('--android') - out_dir = 'android_' + out_dir - - # Delete out_dir so that we start from a clean slate. See skbug/6310. - self.m.run.rmtree(flutter_dir.join('out', out_dir)) - - # Run GN. - self.m.run( - self.m.step, - 'gn_gen', - cmd=['flutter/tools/gn'] + gn_args) - - # Build Flutter. - self.m.run( - self.m.step, - 'build_flutter', - cmd=['ninja', '-C', 'out/' + out_dir, '-j100']) + # Setup GN args. + gn_args = [ + '--runtime-mode=%s' % configuration, + ] + if 'Android' in extra_config: + gn_args.append('--android') + out_dir = 'android_' + out_dir + + # Delete out_dir so that we start from a clean slate. See skbug/6310. + self.m.run.rmtree(flutter_dir.join('out', out_dir)) + + # Run GN. + self.m.run( + self.m.step, + 'gn_gen', + cmd=['flutter/tools/gn'] + gn_args) + + # Build Flutter. + self.m.run( + self.m.step, + 'build_flutter', + cmd=['ninja', '-C', 'out/' + out_dir, '-j100']) diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index ce57ab6df2..36c14dfa6c 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -23,18 +23,11 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): svg_dir = self.m.vars.android_data_dir + 'svgs', tmp_dir = self.m.vars.android_data_dir) - def _strip_environment(self): - self.m.vars.default_env = {k: v for (k,v) - in self.m.vars.default_env.iteritems() - if k in ['PATH']} - def _run(self, title, *cmd, **kwargs): - self._strip_environment() with self.m.step.context({'cwd': self.m.vars.skia_dir}): return self.m.run(self.m.step, title, cmd=list(cmd), **kwargs) def _py(self, title, script, infra_step=True): - self._strip_environment() with self.m.step.context({'cwd': self.m.vars.skia_dir}): return self.m.run(self.m.python, title, script=script, infra_step=infra_step) diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 6040447521..4ee2f8efc1 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -124,13 +124,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): ninja = 'ninja.exe' if 'Win' in os else 'ninja' gn = self.m.vars.skia_dir.join('bin', gn) - env = self.m.step.get_from_context('env', {}) - env.update(self.m.vars.default_env) - env['PATH'] = self.m.path.pathsep.join([ - env.get('PATH', '%(PATH)s'), - str(self.m.bot_update._module.PACKAGE_REPO_ROOT), - ]) - with self.m.step.context({'cwd': self.m.vars.skia_dir, 'env': env}): + with self.m.step.context({'cwd': self.m.vars.skia_dir}): self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn')) self._run('gn gen', [gn, 'gen', self.out_dir, '--args=' + gn_args]) self._run('ninja', [ninja, '-C', self.out_dir]) @@ -149,14 +143,14 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): def step(self, name, cmd): app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0]) cmd = [app] + cmd[1:] - env = self.m.step.get_from_context('env') or {} + env = self.m.step.get_from_context('env', {}) clang_linux = str(self.m.vars.slave_dir.join('clang_linux')) extra_config = self.m.vars.builder_cfg.get('extra_config', '') if 'SAN' in extra_config: # Sanitized binaries may want to run clang_linux/bin/llvm-symbolizer. - self.m.vars.default_env['PATH'] = '%%(PATH)s:%s' % clang_linux + '/bin' + env['PATH'] = '%%(PATH)s:%s' % clang_linux + '/bin' elif 'Ubuntu' == self.m.vars.builder_cfg.get('os', ''): cmd = ['catchsegv'] + cmd diff --git a/infra/bots/recipe_modules/flavor/pdfium_flavor.py b/infra/bots/recipe_modules/flavor/pdfium_flavor.py index 141b126431..84645f2720 100644 --- a/infra/bots/recipe_modules/flavor/pdfium_flavor.py +++ b/infra/bots/recipe_modules/flavor/pdfium_flavor.py @@ -43,7 +43,7 @@ class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils): gn_args.append('pdf_use_skia=true') - env = self.m.step.get_from_context('env') or {} + env = self.m.step.get_from_context('env', {}) env['CHROMIUM_BUILDTOOLS_PATH'] = str(pdfium_dir.join('buildtools')) with self.m.step.context({'env': env}): self.m.run( diff --git a/infra/bots/recipe_modules/infra/api.py b/infra/bots/recipe_modules/infra/api.py index bdb23be224..9dd7268c27 100644 --- a/infra/bots/recipe_modules/infra/api.py +++ b/infra/bots/recipe_modules/infra/api.py @@ -24,7 +24,7 @@ class InfraApi(recipe_api.RecipeApi): This fails flakily sometimes, so perform multiple attempts. """ - env = self.m.step.get_from_context('env') or {} + env = self.m.step.get_from_context('env', {}) env.update(self.go_env) with self.m.step.context({'env': env}): self.m.run.with_retry( diff --git a/infra/bots/recipe_modules/infra/example.expected/failed_all_updates.json b/infra/bots/recipe_modules/infra/example.expected/failed_all_updates.json index 8bcfefec5e..a5ba6b1b7b 100644 --- a/infra/bots/recipe_modules/infra/example.expected/failed_all_updates.json +++ b/infra/bots/recipe_modules/infra/example.expected/failed_all_updates.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -88,7 +85,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs", "~followup_annotations": [ @@ -105,7 +106,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 2)", "~followup_annotations": [ @@ -122,7 +127,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 3)", "~followup_annotations": [ @@ -139,7 +148,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 4)", "~followup_annotations": [ @@ -156,7 +169,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 5)", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/infra/example.expected/failed_one_update.json b/infra/bots/recipe_modules/infra/example.expected/failed_one_update.json index 36ebdc8191..68f0e41dd2 100644 --- a/infra/bots/recipe_modules/infra/example.expected/failed_one_update.json +++ b/infra/bots/recipe_modules/infra/example.expected/failed_one_update.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -88,7 +85,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs", "~followup_annotations": [ @@ -105,7 +106,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 2)" }, diff --git a/infra/bots/recipe_modules/infra/example.expected/infra_tests.json b/infra/bots/recipe_modules/infra/example.expected/infra_tests.json index 4b26480db3..1576173738 100644 --- a/infra/bots/recipe_modules/infra/example.expected/infra_tests.json +++ b/infra/bots/recipe_modules/infra/example.expected/infra_tests.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -88,7 +85,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs" }, diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py index d7e06a170e..8fdeca70db 100644 --- a/infra/bots/recipe_modules/perf/api.py +++ b/infra/bots/recipe_modules/perf/api.py @@ -195,8 +195,7 @@ def perf_steps(api): if not k in keys_blacklist: args.extend([k, api.vars.builder_cfg[k]]) - env = {} - env.update(api.vars.default_env) + env = api.step.get_from_context('env', {}) if 'Ubuntu16' in api.vars.builder_name: # The vulkan in this asset name simply means that the graphics driver # supports Vulkan. It is also the driver used for GL code. @@ -238,11 +237,13 @@ def perf_steps(api): class PerfApi(recipe_api.RecipeApi): def run(self): self.m.core.setup() + env = self.m.step.get_from_context('env', {}) if 'iOS' in self.m.vars.builder_name: - self.m.vars.default_env['IOS_BUNDLE_ID'] = 'com.google.nanobench' - try: - self.m.flavor.install_everything() - perf_steps(self.m) - finally: - self.m.flavor.cleanup_steps() - self.m.run.check_failure() + env['IOS_BUNDLE_ID'] = 'com.google.nanobench' + with self.m.step.context({'env': env}): + try: + self.m.flavor.install_everything() + perf_steps(self.m) + finally: + self.m.flavor.cleanup_steps() + self.m.run.check_failure() 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" diff --git a/infra/bots/recipe_modules/run/api.py b/infra/bots/recipe_modules/run/api.py index 61f4f0742b..e4e0ae8851 100644 --- a/infra/bots/recipe_modules/run/api.py +++ b/infra/bots/recipe_modules/run/api.py @@ -68,7 +68,7 @@ class SkiaStepApi(recipe_api.RecipeApi): def rmtree(self, path): """Wrapper around api.file.rmtree with environment fix.""" - env = self.m.step.get_from_context('env') or {} + env = self.m.step.get_from_context('env', {}) env['PYTHONPATH'] = str(self.m.path['start_dir'].join( 'skia', 'infra', 'bots', '.recipe_deps', 'build', 'scripts')) with self.m.step.context({'env': env}): @@ -79,10 +79,11 @@ class SkiaStepApi(recipe_api.RecipeApi): def __call__(self, steptype, name, abort_on_failure=True, fail_build_on_failure=True, **kwargs): """Run a step. If it fails, keep going but mark the build status failed.""" - env = self.m.step.get_from_context('env') or {} + env = self.m.step.get_from_context('env', {}) env.update(self.m.vars.default_env) try: - return steptype(name=name, **kwargs) + with self.m.step.context({'env': env}): + return steptype(name=name, **kwargs) except self.m.step.StepFailure as e: if abort_on_failure or fail_build_on_failure: self._failed.append(e) diff --git a/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json b/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json index 1576c10569..807b3d0133 100644 --- a/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json +++ b/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json @@ -28,6 +28,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" }, @@ -37,6 +43,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": [ @@ -82,6 +94,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" }, @@ -115,6 +133,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/" @@ -128,6 +152,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" }, @@ -140,6 +170,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" }, @@ -152,6 +188,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" }, @@ -163,6 +205,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": [ @@ -192,6 +240,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" }, @@ -203,6 +257,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 skpbench" }, @@ -219,6 +279,12 @@ "--config", "gles,glesinst4" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "skpbench" }, { @@ -306,6 +372,12 @@ "os", "Android" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "Parse skpbench output into Perf json" }, { @@ -315,6 +387,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": [ @@ -342,6 +420,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/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json b/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json index bcd643e32a..8974bc648a 100644 --- a/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json +++ b/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json @@ -28,6 +28,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" }, @@ -37,6 +43,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": [ @@ -82,6 +94,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" }, @@ -115,6 +133,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/" @@ -128,6 +152,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" }, @@ -140,6 +170,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" }, @@ -152,6 +188,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" }, @@ -163,6 +205,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": [ @@ -192,6 +240,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" }, @@ -203,6 +257,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 skpbench" }, @@ -219,6 +279,12 @@ "--config", "vk" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "skpbench" }, { @@ -306,6 +372,12 @@ "os", "Android" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "Parse skpbench output into Perf json" }, { @@ -315,6 +387,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": [ @@ -342,6 +420,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/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py index bbc8844151..84ba76d10e 100644 --- a/infra/bots/recipe_modules/sktest/api.py +++ b/infra/bots/recipe_modules/sktest/api.py @@ -568,8 +568,7 @@ def test_steps(api): args.append(skip_flag) args.extend(dm_flags(api.vars.builder_name)) - env = {} - env.update(api.vars.default_env) + env = api.step.get_from_context('env', {}) if 'Ubuntu16' in api.vars.builder_name: # The vulkan in this asset name simply means that the graphics driver # supports Vulkan. It is also the driver used for GL code. @@ -611,11 +610,13 @@ def test_steps(api): class TestApi(recipe_api.RecipeApi): def run(self): self.m.core.setup() + env = self.m.step.get_from_context('env', {}) if 'iOS' in self.m.vars.builder_name: - self.m.vars.default_env['IOS_BUNDLE_ID'] = 'com.google.dm' - try: - self.m.flavor.install_everything() - test_steps(self.m) - finally: - self.m.flavor.cleanup_steps() - self.m.run.check_failure() + env['IOS_BUNDLE_ID'] = 'com.google.dm' + with self.m.step.context({'env': env}): + try: + self.m.flavor.install_everything() + test_steps(self.m) + finally: + self.m.flavor.cleanup_steps() + self.m.run.check_failure() diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json index c79030837e..93093327c8 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value MT6582 extra_config GN_Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa --match ~WritePixels; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json index 27dc3d28c8..ed668e9db3 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value Mali400MP2 extra_config GN_Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW _ gm _ bigblurs _ gm _ bleed _ gm _ bleed_alpha_bmp _ gm _ bleed_alpha_bmp_shader _ gm _ bleed_alpha_image _ gm _ bleed_alpha_image_shader _ gm _ bleed_image _ gm _ dropshadowimagefilter _ gm _ filterfastbounds gles gm _ imageblurtiled glesmsaa4 gm _ imageblurtiled glesmsaa4 gm _ imagefiltersbase _ gm _ imagefiltersclipped _ gm _ imagefiltersscaled _ gm _ imageresizetiled _ gm _ matrixconvolution _ gm _ strokedlines --match ~WritePixels; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json index b360da4096..9d981fe70d 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value Adreno306 extra_config Android model GalaxyJ5 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~SRGBReadWritePixels; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json index e6a5213685..53702f4a25 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value MaliT760 extra_config Android model GalaxyS6 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~SpecialImage; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json index ca3e2566a8..ef72e352e0 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno530 extra_config Android model GalaxyS7_G930A os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json index c1cf17f770..c585fdb1ac 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Vivante extra_config Android model GalaxyTab3 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW _ gm _ scaled_tilemodes_npot; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json index 3e8aefb407..550e9c1e1b 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model NVIDIA_Shield os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gl gldft glsrgb glmsaa4 glinstdit4 serialize-8888 tiles_rt-8888 pic-8888 glinst --src tests gm image colorImage svg --blacklist glsrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json index 773bc8c4e5..8394408101 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value MaliT604 extra_config GN_Android model Nexus10 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~CopySurface ~SRGBReadWritePixels; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json index a314f4d68d..09bf6e5c4a 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value Adreno330 extra_config Android model Nexus5 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW _ gm _ encode-platform --noRAW_threading; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json index eda0796320..d822aa8b0a 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 glesinst --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json index 2f2ec29174..72a1a0b8ba 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno430 extra_config GN_Android_Vulkan model Nexus6p os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config vk --src tests gm image colorImage svg --blacklist _ test _ GrShape _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~XfermodeImageFilterCroppedInput ~GrTextureStripAtlasFlush ~CopySurface; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json index 77b1947fa1..40f698e32b 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -584,6 +758,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -594,6 +774,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": [ @@ -621,6 +807,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/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json index d34620a6bf..348065a7b8 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-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" }, @@ -467,6 +599,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -479,6 +617,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -512,6 +656,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -556,6 +706,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -567,6 +723,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 dm" }, @@ -578,6 +740,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch x86 compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value SSE4 extra_config GN_Android model NexusPlayer os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 srgb gles glessrgb --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape --match ~ResourceCache --noRAW_threading; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -589,6 +757,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 dm.sh" }, @@ -599,6 +773,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" }, @@ -610,6 +790,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -635,6 +821,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -645,6 +837,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": [ @@ -672,6 +870,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/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json index 72eb1772ca..76af59ed11 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-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" }, @@ -467,6 +599,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -479,6 +617,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -512,6 +656,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -556,6 +706,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -567,6 +723,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 dm" }, @@ -578,6 +740,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch x86 compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config GN_Android_Vulkan model NexusPlayer os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config vk --src tests gm colorImage --blacklist _ test _ GrShape _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~ResourceCache ~hardstop_gradient ~gradients_dup_color_stops ~gradients_no_texture$ ~tilemodes ~shadertext$ ~bitmapfilters ~GrContextFactory_abandon --noRAW_threading; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -589,6 +757,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 dm.sh" }, @@ -599,6 +773,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" }, @@ -610,6 +790,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -635,6 +821,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -645,6 +837,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": [ @@ -672,6 +870,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/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json index 4c45342fa2..6a4484f649 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.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": [ @@ -121,6 +145,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/" @@ -134,6 +164,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" }, @@ -146,6 +182,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" }, @@ -158,6 +200,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" }, @@ -169,6 +217,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": [ @@ -198,6 +252,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" }, @@ -231,6 +291,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/" @@ -244,6 +310,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" }, @@ -256,6 +328,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" }, @@ -268,6 +346,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" }, @@ -279,6 +363,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": [ @@ -308,6 +398,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" }, @@ -341,6 +437,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/" @@ -354,6 +456,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" }, @@ -366,6 +474,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" }, @@ -378,6 +492,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" }, @@ -389,6 +509,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": [ @@ -418,6 +544,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" }, @@ -467,6 +599,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -479,6 +617,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -512,6 +656,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -556,6 +706,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -567,6 +723,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 dm" }, @@ -578,6 +740,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model PixelC os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 glesinstdit4 serialize-8888 tiles_rt-8888 pic-8888 glesinst --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -589,6 +757,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 dm.sh" }, @@ -599,6 +773,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" }, @@ -610,6 +790,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -635,6 +821,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -645,6 +837,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": [ @@ -672,6 +870,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/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index 52ec330df0..94f00d84a7 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -614,6 +620,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index f186bc4da4..ae0d98ed10 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -516,6 +522,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 60d7c97767..514bc3bd90 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -411,6 +417,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index 1bec57b832..26c7b2c019 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -529,6 +535,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json index 26c08c702d..7f8ab953ff 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json @@ -423,6 +423,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 8aff2e9560..f7532e0722 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -425,6 +425,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index db80bebd7e..62bbb7b817 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -527,6 +533,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index 38fb08ae73..34184d2636 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -529,6 +535,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index cc831b0bfd..e670711cab 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -425,6 +425,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 8f356e14cd..427a4cdec8 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -452,6 +452,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json index a69a065ea2..b66ce51a89 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json @@ -453,6 +453,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json index d8cddfef18..5461cbcd17 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json @@ -453,6 +453,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json index 95279d8248..c7b020c89d 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -330,7 +336,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/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json index 92d070b995..b53a3d7e06 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -529,6 +535,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 dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json index 034a6c1b4f..9093be13c3 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -534,6 +540,7 @@ "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json index 6060e54344..4c69425f24 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]\\out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -373,6 +379,7 @@ "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json index 5bce9911e0..6c8681944a 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]\\out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -437,6 +443,7 @@ "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index d5383b0b24..bf4aef5458 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]\\out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -367,6 +373,7 @@ "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json index 14a12c2c15..e59ae00096 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]\\out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -369,6 +375,7 @@ "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index fe347f1590..138259d78a 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]\\out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +511,7 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 1df8deb276..653c0166f7 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]\\out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -381,6 +387,7 @@ "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index ebcd2bd696..85192ec670 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-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.dm", + "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.dm" + }, "infra_step": true, "name": "Get downloaded SKP VERSION" }, @@ -26,6 +36,9 @@ "42", "[START_DIR]/tmp/SKP_VERSION" ], + "env": { + "IOS_BUNDLE_ID": "com.google.dm" + }, "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.dm", + "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.dm", + "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.dm", + "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.dm", + "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.dm", + "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.dm", + "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.dm" + }, "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.dm" + }, "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.dm", + "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.dm", + "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.dm", + "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.dm", + "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.dm", + "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.dm", + "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.dm" + }, "infra_step": true, "name": "Get downloaded SVG VERSION" }, @@ -160,6 +266,9 @@ "42", "[START_DIR]/tmp/SVG_VERSION" ], + "env": { + "IOS_BUNDLE_ID": "com.google.dm" + }, "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.dm", + "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.dm", + "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.dm", + "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.dm", + "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.dm", + "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.dm", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "push_file [START_DIR]/tmp/SVG_VERSION" }, { @@ -217,6 +368,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { + "IOS_BUNDLE_ID": "com.google.dm", "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "infra_step": true, @@ -230,6 +382,9 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm", "511" ], + "env": { + "IOS_BUNDLE_ID": "com.google.dm" + }, "infra_step": true, "name": "makedirs dm", "~followup_annotations": [ @@ -250,6 +405,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "dm" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.dm", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "rm dm" }, { @@ -257,6 +419,13 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "dm" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.dm", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "mkdir dm" }, { @@ -267,6 +436,9 @@ "[START_DIR]/tmp", "511" ], + "env": { + "IOS_BUNDLE_ID": "com.google.dm" + }, "infra_step": true, "name": "makedirs tmp_dir", "~followup_annotations": [ @@ -289,6 +461,13 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.dm", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -331,6 +510,13 @@ "[START_DIR]/tmp/uninteresting_hashes.txt", "tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.dm", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt" }, { @@ -344,6 +530,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -362,6 +549,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" @@ -372,6 +560,13 @@ "dm", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "IOS_BUNDLE_ID": "com.google.dm", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "pull_if_needed dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json index 957dd6ab10..27eae55c0d 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json +++ b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]\\out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +511,7 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json index 8482f9df69..bc8913855a 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json +++ b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -527,6 +533,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm", diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json b/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json index 65ad219e59..6e60c6e033 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json +++ b/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -507,6 +645,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -518,6 +662,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 dm" }, @@ -529,6 +679,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android build_number 6 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -540,6 +696,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 dm.sh" }, @@ -550,6 +712,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" }, @@ -561,6 +729,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -586,6 +760,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, @@ -596,6 +776,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": [ @@ -623,6 +809,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/sktest/example.expected/failed_pull.json b/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json index 48406f7816..f1a2baf746 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json +++ b/infra/bots/recipe_modules/sktest/example.expected/failed_pull.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" }, @@ -416,6 +536,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -428,6 +554,12 @@ "/sdcard/revenge_of_the_skiabot/dm_out" ], "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/dm_out" }, @@ -461,6 +593,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -505,6 +643,12 @@ "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], "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/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, @@ -516,6 +660,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 dm" }, @@ -527,6 +677,12 @@ "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android build_number 6 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value MaliT604 extra_config Android model Nexus10 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~CopySurface ~SRGBReadWritePixels; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.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 dm.sh" }, @@ -538,6 +694,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 dm.sh" }, @@ -548,6 +710,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" }, @@ -559,6 +727,12 @@ "/data/local/tmp/", "dm.sh" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "step returned non-zero exit code: 1", @@ -586,6 +760,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm", "~followup_annotations": [ @@ -600,6 +780,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": [ @@ -627,6 +813,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/sktest/example.expected/failed_push.json b/infra/bots/recipe_modules/sktest/example.expected/failed_push.json index 5f7f94feeb..9b124572cc 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/failed_push.json +++ b/infra/bots/recipe_modules/sktest/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/sktest/example.expected/nobuildbot.json b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json index 117673b120..55ee548603 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json +++ b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -567,6 +573,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json index 4226a3cd5a..003d3058c7 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -533,6 +539,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/vars/__init__.py b/infra/bots/recipe_modules/vars/__init__.py index b3a5340649..d5cf1da80b 100644 --- a/infra/bots/recipe_modules/vars/__init__.py +++ b/infra/bots/recipe_modules/vars/__init__.py @@ -4,6 +4,7 @@ DEPS = [ 'builder_name_schema', + 'depot_tools/bot_update', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/properties', diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 2e2923b986..93910fecda 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -31,7 +31,11 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.slave_dir = self.m.path['start_dir'] self.checkout_root = self.slave_dir - self.default_env = {} + self.default_env = self.m.step.get_from_context('env', {}) + self.default_env['PATH'] = self.m.path.pathsep.join([ + self.default_env.get('PATH', '%(PATH)s'), + str(self.m.bot_update._module.PACKAGE_REPO_ROOT), + ]) self.gclient_env = {} self.is_compile_bot = self.builder_name.startswith('Build-') self.no_buildbot = self.m.properties.get('nobuildbot', '') == 'True' diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index 7c3ac32447..8d87d89ed7 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -45,12 +45,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json index c295b71c06..8c0d4385e2 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -45,12 +45,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -203,7 +200,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs" }, diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json index 8416fd3bbd..819e7580bb 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json @@ -45,12 +45,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -203,7 +200,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json index cbc0be27f0..c068ef92fa 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index 9deb01e290..3c14cd0f44 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json index 951d245dd8..b3497dfbdb 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json index ce81ed9bb4..32b2fa17a0 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 3de613915d..d08800b6a0 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -49,12 +49,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json index 0f11391220..3a39cb5e3f 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index f5be4fa52b..8ca0fdd851 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 089926b907..41d24accde 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index d2f3f6dcc9..a38d715b89 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 067476bc4a..3d0694f231 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index e03ec42275..718129fe08 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index f1d2900225..5ab7f4760f 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 0105599d68..03360d4c5a 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json index 8f87e81160..a85dc852e8 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -47,12 +47,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -120,6 +117,12 @@ "456789" ], "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "generate and upload binary size data" }, { diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json index f842478441..fa7d584bcd 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -108,6 +105,12 @@ "RECIPE_MODULE[skia::core]/resources/generate_and_upload_doxygen.py" ], "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "generate and upload doxygen" }, { @@ -122,6 +125,12 @@ "[DEPOT_TOOLS]/gsutil.py" ], "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "generate and upload binary size data" }, { diff --git a/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json b/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json index 8bcfefec5e..a5ba6b1b7b 100644 --- a/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -88,7 +85,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs", "~followup_annotations": [ @@ -105,7 +106,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 2)", "~followup_annotations": [ @@ -122,7 +127,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 3)", "~followup_annotations": [ @@ -139,7 +148,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 4)", "~followup_annotations": [ @@ -156,7 +169,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 5)", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_infra.expected/failed_one_update.json b/infra/bots/recipes/swarm_infra.expected/failed_one_update.json index 36ebdc8191..68f0e41dd2 100644 --- a/infra/bots/recipes/swarm_infra.expected/failed_one_update.json +++ b/infra/bots/recipes/swarm_infra.expected/failed_one_update.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -88,7 +85,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs", "~followup_annotations": [ @@ -105,7 +106,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 2)" }, diff --git a/infra/bots/recipes/swarm_infra.expected/infra_tests.json b/infra/bots/recipes/swarm_infra.expected/infra_tests.json index 4b26480db3..1576173738 100644 --- a/infra/bots/recipes/swarm_infra.expected/infra_tests.json +++ b/infra/bots/recipes/swarm_infra.expected/infra_tests.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -88,7 +85,11 @@ "go.skia.org/infra/..." ], "env": { - "GOPATH": "[CUSTOM_/_B_WORK]/gopath" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "GOPATH": "[CUSTOM_/_B_WORK]/gopath", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs" }, diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json index e11427bd5d..ad50d170a0 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json @@ -180,6 +180,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/recipes/swarm_presubmit.expected/presubmit.json b/infra/bots/recipes/swarm_presubmit.expected/presubmit.json index 5dbb8454ce..29f614b6a7 100644 --- a/infra/bots/recipes/swarm_presubmit.expected/presubmit.json +++ b/infra/bots/recipes/swarm_presubmit.expected/presubmit.json @@ -43,12 +43,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json index 1576c10569..807b3d0133 100644 --- a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json +++ b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json @@ -28,6 +28,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" }, @@ -37,6 +43,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": [ @@ -82,6 +94,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" }, @@ -115,6 +133,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/" @@ -128,6 +152,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" }, @@ -140,6 +170,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" }, @@ -152,6 +188,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" }, @@ -163,6 +205,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": [ @@ -192,6 +240,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" }, @@ -203,6 +257,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 skpbench" }, @@ -219,6 +279,12 @@ "--config", "gles,glesinst4" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "skpbench" }, { @@ -306,6 +372,12 @@ "os", "Android" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "Parse skpbench output into Perf json" }, { @@ -315,6 +387,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": [ @@ -342,6 +420,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/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index e56cd5a1bb..5c003f9a9c 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -132,6 +132,12 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -529,6 +535,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" |