OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 from pylib import constants | 5 from pylib import constants |
6 from pylib.local.device import local_device_environment | 6 from pylib.local.device import local_device_environment |
7 from pylib.local.machine import local_machine_environment | 7 from pylib.local.machine import local_machine_environment |
8 | 8 |
9 def CreateEnvironment(args, error_func): | 9 def CreateEnvironment(args, output_manager, error_func): |
10 | 10 |
11 if args.environment == 'local': | 11 if args.environment == 'local': |
12 if args.command not in constants.LOCAL_MACHINE_TESTS: | 12 if args.command not in constants.LOCAL_MACHINE_TESTS: |
13 return local_device_environment.LocalDeviceEnvironment(args, error_func) | 13 return local_device_environment.LocalDeviceEnvironment( |
| 14 args, output_manager, error_func) |
14 else: | 15 else: |
15 return local_machine_environment.LocalMachineEnvironment(args, error_func) | 16 return local_machine_environment.LocalMachineEnvironment( |
| 17 args, output_manager, error_func) |
16 | 18 |
17 error_func('Unable to create %s environment.' % args.environment) | 19 error_func('Unable to create %s environment.' % args.environment) |
OLD | NEW |