From b35a41ec1684bbcbc36bf376ab65dcc84fca22fe Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Thu, 13 Oct 2016 14:54:32 -0400 Subject: Add timestamp to bot ninja output. The default NINJA_STATUS format is "[%f/%t] ". This prepends %e to help diagnose slow builds. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3323 Change-Id: Ied27317cedc2b07ff57c59eae61fe9e86c7fea33 Reviewed-on: https://skia-review.googlesource.com/3323 Commit-Queue: Mike Klein Reviewed-by: Eric Boren --- infra/bots/recipe_modules/flavor/gn_android_flavor.py | 5 +++-- infra/bots/recipe_modules/flavor/gn_flavor.py | 3 ++- .../Build-Mac-Clang-mipsel-Debug-GN_Android.json | 1 + .../Build-Mac-Clang-x86_64-Debug-CommandBuffer.json | 1 + .../swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json | 1 + .../Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json | 1 + .../Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json | 1 + .../Build-Ubuntu-Clang-arm64-Release-GN_Android.json | 1 + .../Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json | 1 + .../swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json | 1 + .../swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json | 1 + .../recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json | 1 + .../swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json | 1 + .../swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json | 1 + .../swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json | 1 + ...-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json | 1 + .../Build-Ubuntu-GCC-x86_64-Release-ANGLE.json | 1 + .../swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json | 1 + .../swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json | 1 + .../Build-Ubuntu-GCC-x86_64-Release-Valgrind.json | 1 + .../swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json | 1 + .../swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json | 1 + infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json | 1 + infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json | 1 + infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json | 1 + infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json | 1 + infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json | 1 + .../swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json | 1 + .../recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json | 1 + infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json | 1 + infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json | 1 + .../bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json | 1 + .../bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json | 1 + .../swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json | 1 + 34 files changed, 37 insertions(+), 3 deletions(-) (limited to 'infra/bots') diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index 6e78ab8cdd..92afee5dcf 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -33,7 +33,7 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): in self.m.vars.default_env.iteritems() if k in ['PATH']} return self.m.run(self.m.step, title, cmd=list(cmd), - cwd=self.m.vars.skia_dir, env={}, **kwargs) + cwd=self.m.vars.skia_dir, **kwargs) def _adb(self, title, *cmd, **kwargs): self._ever_ran_adb = True @@ -72,7 +72,8 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): self._run('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn'), infra_step=True) self._run('gn gen', 'gn', 'gen', self.out_dir, '--args=' + gn_args) - self._run('ninja', 'ninja', '-C', self.out_dir) + self._run('ninja', 'ninja', '-C', self.out_dir, + env={'NINJA_STATUS': '%%e [%%f/%%t] '}) def install(self): self._adb('mkdir ' + self.device_dirs.resource_dir, diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 548bd85b33..a189536eb9 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -121,7 +121,8 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): 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]) + self._run('ninja', [ninja, '-C', self.out_dir], + env={'NINJA_STATUS': '%%e [%%f/%%t] '}) def step(self, name, cmd, env=None, **kwargs): app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0]) diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json index 59bd389d04..48dce7ed19 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json @@ -150,6 +150,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 296bc17a28..2870a3e98e 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -193,6 +193,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json index afb2ad8b5d..4322004f97 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json index 8e4a61b462..599b6fc612 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json @@ -170,6 +170,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json index 99a7723f7a..7d439f5949 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json @@ -150,6 +150,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json index bdcdf42bae..f0ac0a1d56 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json @@ -150,6 +150,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json index bbe07cc530..b2de400613 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json @@ -150,6 +150,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 2736afd54d..cf0b2fb889 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json index 63a6c02458..c8102f3e3f 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json index c184198290..f674d53902 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index b92a4ea481..6068f1063d 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index eb857e3e16..6ccbe84615 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index 9d20fd3055..1105bfb7ef 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 54c6712ca3..7b0faeb1c4 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index e9e752acc5..bfb766decf 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index 3dbcf3028b..f74172c40c 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index f3f5490bdc..6991fe30ae 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json index f7234aebe7..4825fdb055 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 90053e0740..42dc39d23c 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json index f3ccd72aa9..b88592f56d 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -152,6 +152,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 1ac96efbd1..76c327ca58 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 b6306ad2d0..9c9bf03127 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 8817125664..e5ca88b26c 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 2908b23911..f7346d30c7 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 @@ -194,6 +194,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 9ca2b582c6..c015fb21f2 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 702006c5d6..3378868374 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 6e29f0c8dd..01341b4bff 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 780247bba6..cb4c2ee665 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 9feeb77d43..1bc3122e7f 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 0523523939..8a41283bd4 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 8b019691aa..81e76b1c36 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" 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 73f20fb0a4..d7d945671d 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 @@ -174,6 +174,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" -- cgit v1.2.3