From 560285d93ae62d88c359a664b7935530ad74e9a8 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 18 Oct 2016 14:51:58 -0400 Subject: [PATCH] Remove custom NINJA_STATUS. I think the Ninja [nnn/mmm] counts started going off when we landed this. I'd rather have the [nnn/mmm] be correct than have the timestamps. Change-Id: I96d24664789393056f94202f2b549ed5a4fe4bdb Reviewed-on: https://skia-review.googlesource.com/3604 Reviewed-by: Eric Boren Commit-Queue: Mike Klein --- infra/bots/recipe_modules/flavor/gn_android_flavor.py | 3 +-- 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 - ...ld-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json | 1 - .../swarm_compile.expected/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 - .../recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json | 1 - .../swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json | 1 - .../bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json | 1 - .../recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json | 1 - .../recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json | 1 - .../swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json | 1 - infra/bots/recipes/swarm_compile.expected/big_issue_number.json | 1 - .../recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json | 1 - .../recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json | 1 - .../bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.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 - .../recipes/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 - infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json | 1 - infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json | 1 - .../recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json | 1 - 42 files changed, 2 insertions(+), 44 deletions(-) diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index 1fc7230..4fee75f 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -69,8 +69,7 @@ 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, - env={'NINJA_STATUS': '%%e [%%f/%%t] '}) + self._run('ninja', 'ninja', '-C', self.out_dir) 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 6e01dee..3600220 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -106,8 +106,7 @@ 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], - env={'NINJA_STATUS': '%%e [%%f/%%t] '}) + self._run('ninja', [ninja, '-C', self.out_dir]) def copy_extra_build_products(self, swarming_out_dir): configuration = self.m.vars.builder_cfg.get('configuration', '') 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 48dce7e..59bd389 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,7 +150,6 @@ ], "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 2870a3e..296bc17 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,7 +193,6 @@ ], "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 4322004..afb2ad8 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,7 +152,6 @@ ], "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 599b6fc..8e4a61b 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,7 +170,6 @@ ], "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 7d439f5..99a7723 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,7 +150,6 @@ ], "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 f0ac0a1..bdcdf42 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,7 +150,6 @@ ], "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 b2de400..bbe07cc 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,7 +150,6 @@ ], "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 cf0b2fb..2736afd 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,7 +152,6 @@ ], "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 c8102f3..63a6c02 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,7 +152,6 @@ ], "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 f674d53..c184198 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,7 +152,6 @@ ], "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 6068f10..b92a4ea 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,7 +152,6 @@ ], "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 6ccbe84..eb857e3 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,7 +152,6 @@ ], "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 1105bfb..9d20fd3 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,7 +152,6 @@ ], "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 7b0faeb..54c6712 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,7 +152,6 @@ ], "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 bfb766d..e9e752a 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,7 +152,6 @@ ], "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 f74172c..3dbcf30 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,7 +152,6 @@ ], "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 6991fe3..f3f5490 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,7 +152,6 @@ ], "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 4825fdb..f7234ae 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,7 +152,6 @@ ], "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-ANGLE.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index a002b1c..e28bc5b 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -152,7 +152,6 @@ ], "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-Debug-Exceptions.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 42dc39d..90053e0 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,7 +152,6 @@ ], "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-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json index 6eb27e9..e10e987 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json @@ -152,7 +152,6 @@ ], "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-GDI.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json index 38d8f64..603bd8b 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -152,7 +152,6 @@ ], "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 b88592f..f3ccd72 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,7 +152,6 @@ ], "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_64-Release-Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index c8c6814..916b642 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -152,7 +152,6 @@ ], "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/big_issue_number.json b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json index d5d1dcf..8edb3ab 100644 --- a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json @@ -172,7 +172,6 @@ ], "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/buildbotless_trybot_gerrit.json b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json index 381bdc4..e77b41a 100644 --- a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json +++ b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json @@ -191,7 +191,6 @@ ], "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/buildbotless_trybot_rietveld.json b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json index 9f9b8b0..20caf82 100644 --- a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json +++ b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json @@ -194,7 +194,6 @@ ], "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/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json index da84592..3382821 100644 --- a/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json @@ -191,7 +191,6 @@ ], "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 76c327c..1ac96ef 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,7 +174,6 @@ ], "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 9c9bf03..b6306ad 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,7 +174,6 @@ ], "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 e5ca88b..8817125 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,7 +174,6 @@ ], "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 f7346d3..2908b23 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,7 +194,6 @@ ], "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 c015fb2..9ca2b58 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,7 +174,6 @@ ], "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 3378868..702006c 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,7 +174,6 @@ ], "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 01341b4..6e29f0c 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,7 +174,6 @@ ], "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 cb4c2ee..780247b 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,7 +174,6 @@ ], "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 1bc3122..9feeb77 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,7 +174,6 @@ ], "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 8a41283..0523523 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,7 +174,6 @@ ], "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 81e76b1..8b01969 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,7 +174,6 @@ ], "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 d7d9456..73f20fb 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,7 +174,6 @@ ], "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" -- 2.7.4