Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: scripts/slave/recipe_modules/chromium/api.py

Issue 873403002: Add support for cc_perftests and other non-telemetry gtest based tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Added android_mode. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import re 5 import re
6 6
7 from slave import recipe_api 7 from slave import recipe_api
8 from slave import recipe_util 8 from slave import recipe_util
9 9
10 from . import builders 10 from . import builders
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 697
698 args.extend(['--build-config-fs', self.c.build_config_fs]) 698 args.extend(['--build-config-fs', self.c.build_config_fs])
699 699
700 paths = {} 700 paths = {}
701 for path in ('build', 'checkout'): 701 for path in ('build', 'checkout'):
702 paths[path] = self.m.path[path] 702 paths[path] = self.m.path[path]
703 args.extend(['--paths', self.m.json.input(paths)]) 703 args.extend(['--paths', self.m.json.input(paths)])
704 704
705 properties = {} 705 properties = {}
706 # TODO(phajdan.jr): Remove buildnumber when no longer used. 706 # TODO(phajdan.jr): Remove buildnumber when no longer used.
707 for name in ('buildername', 'slavename', 'buildnumber'): 707
708 mastername = self.m.properties.get('mastername')
709 buildername = self.m.properties.get('buildername')
710 master_dict = self.builders.get(mastername, {})
711 bot_config = master_dict.get('builders', {}).get(buildername, {})
712
713 for name in ('buildername', 'slavename', 'buildnumber', 'mastername'):
708 properties[name] = self.m.properties[name] 714 properties[name] = self.m.properties[name]
715
716 # Optional properties
717 for name in ('perf-id', 'results-url'):
718 if bot_config.get(name):
719 properties[name] = bot_config[name]
720
721 properties['android_mode'] = self.c.TARGET_PLATFORM == 'android'
Paweł Hajdan Jr. 2015/02/23 20:44:18 Why not pass the value of TARGET_PLATFORM instead?
shatch 2015/02/23 21:05:55 Done.
722
709 args.extend(['--properties', self.m.json.input(properties)]) 723 args.extend(['--properties', self.m.json.input(properties)])
710 724
711 return args 725 return args
712 726
713 def get_compile_targets_for_scripts(self): 727 def get_compile_targets_for_scripts(self):
714 return self.m.python( 728 return self.m.python(
715 name='get compile targets for scripts', 729 name='get compile targets for scripts',
716 script=self.m.path['checkout'].join( 730 script=self.m.path['checkout'].join(
717 'testing', 'scripts', 'get_compile_targets.py'), 731 'testing', 'scripts', 'get_compile_targets.py'),
718 args=[ 732 args=[
719 '--output', self.m.json.output(), 733 '--output', self.m.json.output(),
720 '--', 734 '--',
721 ] + self.get_common_args_for_scripts(), 735 ] + self.get_common_args_for_scripts(),
722 step_test_data=lambda: self.m.json.test_api.output({})) 736 step_test_data=lambda: self.m.json.test_api.output({}))
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium/chromium_perf.py » ('j') | scripts/slave/recipe_modules/chromium/steps.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698