| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 os | 5 import os |
| 6 import sys | 6 import sys |
| 7 | 7 |
| 8 from telemetry import benchmark | 8 from telemetry import benchmark |
| 9 from telemetry.core import browser_finder | 9 from telemetry.core import browser_finder |
| 10 | 10 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 if target_os.startswith('win'): | 44 if target_os.startswith('win'): |
| 45 return 'win' | 45 return 'win' |
| 46 if target_os.startswith('linux'): | 46 if target_os.startswith('linux'): |
| 47 return 'linux' | 47 return 'linux' |
| 48 return target_os | 48 return target_os |
| 49 | 49 |
| 50 def _GetVariationsBrowserArgs(self, finder_options): | 50 def _GetVariationsBrowserArgs(self, finder_options): |
| 51 variations_dir = os.path.join(os.path.dirname(__file__), os.pardir, | 51 variations_dir = os.path.join(os.path.dirname(__file__), os.pardir, |
| 52 os.pardir, os.pardir, 'testing', 'variations') | 52 os.pardir, os.pardir, 'testing', 'variations') |
| 53 target_os = browser_finder.FindBrowser(finder_options).target_os | 53 target_os = browser_finder.FindBrowser(finder_options).target_os |
| 54 base_variations_path = os.path.join(variations_dir, | 54 return fieldtrial_util.GenerateArgs( |
| 55 'fieldtrial_testing_config.json') | |
| 56 return fieldtrial_util.GenerateArgs(base_variations_path, | |
| 57 os.path.join(variations_dir, | 55 os.path.join(variations_dir, |
| 58 'fieldtrial_testing_config_%s.json' % self._FixupTargetOS(target_os))) | 56 'fieldtrial_testing_config_%s.json' % self._FixupTargetOS(target_os))) |
| OLD | NEW |