From 4465ee1d506119aa350bb3d176b1fa22923209e0 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 8 Jul 2020 16:30:53 +0200 Subject: [PATCH] Fix 'Perf Android32 (M Nexus5)' config in MB. The K Nexus 5 bot has been upgraded to Android M, this CL fixes the following error: MBErr: Builder name "Perf Android32 (M Nexus5)" not found under masters[client.webrtc.perf] No-Try: True Bug: webrtc:11768 Change-Id: Ie45535d622028c4d2dc553205f383b1a920c4ecc Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178879 Commit-Queue: Mirko Bonadei Reviewed-by: Jeremy Leconte Cr-Commit-Position: refs/heads/master@{#31678} --- tools_webrtc/mb/mb_config.pyl | 2 +- tools_webrtc/mb/mb_unittest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index 9f9fdd2d41..20755df9ee 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -108,7 +108,7 @@ # build anything). # TODO(http://crbug.com/1029452): Nuke these and isolate on builder # instead? - 'Perf Android32 (K Nexus5)': 'release_bot_x64', + 'Perf Android32 (M Nexus5)': 'release_bot_x64', 'Perf Android32 (M AOSP Nexus6)': 'release_bot_x64', 'Perf Android64 (M Nexus5X)': 'release_bot_x64', 'Perf Android64 (O Pixel2)': 'release_bot_x64', diff --git a/tools_webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py index c1e477c104..0cf93bb7f0 100755 --- a/tools_webrtc/mb/mb_unittest.py +++ b/tools_webrtc/mb/mb_unittest.py @@ -243,7 +243,7 @@ class UnitTest(unittest.TestCase): mbw=mbw, ret=0) self.assertEqual( mbw.files['/fake_src/out/Debug/args.gn'], - 'import("//build/args/bots/fake_master/fake_args_bot.gn")\n') + 'import("//build/args/bots/fake_master/fake_args_bot.gn")\n\n') def test_gen_fails(self):