diff options
Diffstat (limited to 'infra/bots/recipe_modules/perf')
21 files changed, 4 insertions, 179 deletions
diff --git a/infra/bots/recipe_modules/perf/__init__.py b/infra/bots/recipe_modules/perf/__init__.py index 10649df617..97846cab3a 100644 --- a/infra/bots/recipe_modules/perf/__init__.py +++ b/infra/bots/recipe_modules/perf/__init__.py @@ -10,6 +10,7 @@ DEPS = [ 'recipe_engine/platform', 'recipe_engine/properties', 'recipe_engine/raw_io', + 'recipe_engine/step', 'recipe_engine/time', 'run', 'flavor', diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py index 41e438461c..d7e06a170e 100644 --- a/infra/bots/recipe_modules/perf/api.py +++ b/infra/bots/recipe_modules/perf/api.py @@ -224,9 +224,9 @@ def perf_steps(api): if '_AbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''): args.extend(['--abandonGpuContext', '--nocpu']) - api.run(api.flavor.step, target, cmd=args, - abort_on_failure=False, - env=env) + with api.step.context({'env': env}): + api.run(api.flavor.step, target, cmd=args, + abort_on_failure=False) # Copy results to swarming out dir. if api.vars.upload_perf_results: 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 c812c8372e..a9c3897008 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 @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ 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 bee5a170f3..70bf858f1e 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 @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ 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 ed96881268..b149caf085 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 @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ 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 a595fe1f95..262df6d10a 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 @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ 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 76037e26db..f8a52b0f54 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 @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ 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 b6dfb855d9..83400b5f36 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 @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -170,7 +169,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -281,7 +279,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -392,7 +389,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ 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 4c3047f36a..57a9c20243 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 @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -170,7 +169,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -281,7 +279,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -392,7 +389,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ 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 43fb6e6b10..ce0f41b930 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 @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -170,7 +169,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -281,7 +279,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -392,7 +389,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ 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 276f897f48..d49bf89ac7 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 @@ -174,7 +174,6 @@ "os", "Mac" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", 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 756790c63c..915fe648c0 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 @@ -108,7 +108,6 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", 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 982a7cd2df..3f106bf38c 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 @@ -114,7 +114,6 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", 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 8a77d3f039..564470936c 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 @@ -171,7 +171,6 @@ "os", "Win" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", 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 a4163bd86d..df09733fd2 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 @@ -177,7 +177,6 @@ "os", "Win10" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", 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 e24e762883..2b4d99a44c 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 @@ -117,7 +117,6 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", 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 c6c558c775..72ea825217 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 @@ -179,7 +179,6 @@ "os", "Win8" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", 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 c7d31a8d5c..c4bd59ebf6 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,12 +5,6 @@ "[START_DIR]/skia/resources", "resources" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/skia/resources" }, { @@ -40,12 +34,6 @@ "[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", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "cat_file tmp/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -54,12 +42,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SKP_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm tmp/SKP_VERSION" }, { @@ -67,12 +49,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skps" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm skps" }, { @@ -80,12 +56,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skps" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir skps" }, { @@ -94,12 +64,6 @@ "[START_DIR]/skp", "skps" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/skp" }, { @@ -108,12 +72,6 @@ "[START_DIR]/tmp/SKP_VERSION", "tmp/SKP_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/SKP_VERSION" }, { @@ -143,12 +101,6 @@ "[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", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "cat_file tmp/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -157,12 +109,6 @@ "[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", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm tmp/SK_IMAGE_VERSION" }, { @@ -170,12 +116,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "images" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm images" }, { @@ -183,12 +123,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "images" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir images" }, { @@ -197,12 +131,6 @@ "[START_DIR]/skimage", "images" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/skimage" }, { @@ -211,12 +139,6 @@ "[START_DIR]/tmp/SK_IMAGE_VERSION", "tmp/SK_IMAGE_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" }, { @@ -246,12 +168,6 @@ "[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", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "cat_file tmp/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -260,12 +176,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SVG_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm tmp/SVG_VERSION" }, { @@ -273,12 +183,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "svgs" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm svgs" }, { @@ -286,12 +190,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "svgs" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir svgs" }, { @@ -300,12 +198,6 @@ "[START_DIR]/svg", "svgs" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/svg" }, { @@ -314,12 +206,6 @@ "[START_DIR]/tmp/SVG_VERSION", "tmp/SVG_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/SVG_VERSION" }, { @@ -327,12 +213,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "perf" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm perf" }, { @@ -340,12 +220,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "perf" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir perf" }, { @@ -355,7 +229,6 @@ "[START_DIR]/skia/gn/package_ios.py", "[START_DIR]/out/Release/nanobench" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -374,7 +247,6 @@ "--args", "--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 nonrendering hwui gles --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~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 perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -411,12 +283,6 @@ "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", - "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 e16db8a4c9..eb2bed968d 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 @@ -179,7 +179,6 @@ "os", "Win8" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", 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 8bc41ecfac..5f7f94feeb 100644 --- a/infra/bots/recipe_modules/perf/example.expected/failed_push.json +++ b/infra/bots/recipe_modules/perf/example.expected/failed_push.json @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json index 9e30c66d23..6cb6ce2f77 100644 --- a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json +++ b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json @@ -213,7 +213,6 @@ "os", "Win8" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", |