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.gtest import gtest_test_instance | 5 from pylib.gtest import gtest_test_instance |
6 from pylib.instrumentation import instrumentation_test_instance | 6 from pylib.instrumentation import instrumentation_test_instance |
7 from pylib.junit import junit_test_instance | 7 from pylib.junit import junit_test_instance |
8 from pylib.linker import linker_test_instance | 8 from pylib.linker import linker_test_instance |
9 from pylib.monkey import monkey_test_instance | 9 from pylib.monkey import monkey_test_instance |
10 from pylib.local.device import local_device_environment | 10 from pylib.local.device import local_device_environment |
11 from pylib.local.device import local_device_gtest_run | 11 from pylib.local.device import local_device_gtest_run |
12 from pylib.local.device import local_device_instrumentation_test_run | 12 from pylib.local.device import local_device_instrumentation_test_run |
13 from pylib.local.device import local_device_linker_test_run | 13 from pylib.local.device import local_device_linker_test_run |
14 from pylib.local.device import local_device_monkey_test_run | 14 from pylib.local.device import local_device_monkey_test_run |
15 from pylib.local.device import local_device_perf_test_run | 15 from pylib.local.device import local_device_perf_test_run |
16 from pylib.local.machine import local_machine_environment | 16 from pylib.local.machine import local_machine_environment |
17 from pylib.local.machine import local_machine_junit_test_run | 17 from pylib.local.machine import local_machine_junit_test_run |
18 from pylib.perf import perf_test_instance | 18 from pylib.perf import perf_test_instance |
19 | 19 |
20 | 20 |
21 def _CreatePerfTestRun(args, env, test_instance): | 21 def _CreatePerfTestRun(args, env, test_instance, test_output_saver): |
22 if args.print_step: | 22 if args.print_step: |
23 return local_device_perf_test_run.PrintStep( | 23 return local_device_perf_test_run.PrintStep( |
24 env, test_instance) | 24 env, test_instance, test_output_saver) |
25 elif args.output_json_list: | 25 elif args.output_json_list: |
26 return local_device_perf_test_run.OutputJsonList( | 26 return local_device_perf_test_run.OutputJsonList( |
27 env, test_instance) | 27 env, test_instance, test_output_saver) |
28 return local_device_perf_test_run.LocalDevicePerfTestRun( | 28 return local_device_perf_test_run.LocalDevicePerfTestRun( |
29 env, test_instance) | 29 env, test_instance, test_output_saver) |
30 | 30 |
31 | 31 |
32 def CreateTestRun(args, env, test_instance, error_func): | 32 def CreateTestRun(args, env, test_instance, test_output_saver, error_func): |
33 if isinstance(env, local_device_environment.LocalDeviceEnvironment): | 33 if isinstance(env, local_device_environment.LocalDeviceEnvironment): |
34 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): | 34 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): |
35 return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance) | 35 return local_device_gtest_run.LocalDeviceGtestRun( |
| 36 env, test_instance, test_output_saver) |
36 if isinstance(test_instance, | 37 if isinstance(test_instance, |
37 instrumentation_test_instance.InstrumentationTestInstance): | 38 instrumentation_test_instance.InstrumentationTestInstance): |
38 return (local_device_instrumentation_test_run | 39 return (local_device_instrumentation_test_run |
39 .LocalDeviceInstrumentationTestRun(env, test_instance)) | 40 .LocalDeviceInstrumentationTestRun( |
| 41 env, test_instance, test_output_saver)) |
40 if isinstance(test_instance, linker_test_instance.LinkerTestInstance): | 42 if isinstance(test_instance, linker_test_instance.LinkerTestInstance): |
41 return (local_device_linker_test_run | 43 return (local_device_linker_test_run |
42 .LocalDeviceLinkerTestRun(env, test_instance)) | 44 .LocalDeviceLinkerTestRun(env, test_instance, test_output_saver)) |
43 if isinstance(test_instance, monkey_test_instance.MonkeyTestInstance): | 45 if isinstance(test_instance, monkey_test_instance.MonkeyTestInstance): |
44 return (local_device_monkey_test_run | 46 return (local_device_monkey_test_run |
45 .LocalDeviceMonkeyTestRun(env, test_instance)) | 47 .LocalDeviceMonkeyTestRun(env, test_instance, test_output_saver)) |
46 if isinstance(test_instance, | 48 if isinstance(test_instance, |
47 perf_test_instance.PerfTestInstance): | 49 perf_test_instance.PerfTestInstance): |
48 return _CreatePerfTestRun(args, env, test_instance) | 50 return _CreatePerfTestRun(args, env, test_instance, test_output_saver) |
49 | 51 |
50 if isinstance(env, local_machine_environment.LocalMachineEnvironment): | 52 if isinstance(env, local_machine_environment.LocalMachineEnvironment): |
51 if isinstance(test_instance, junit_test_instance.JunitTestInstance): | 53 if isinstance(test_instance, junit_test_instance.JunitTestInstance): |
52 return (local_machine_junit_test_run | 54 return (local_machine_junit_test_run |
53 .LocalMachineJunitTestRun(env, test_instance)) | 55 .LocalMachineJunitTestRun(env, test_instance, test_output_saver)) |
54 | 56 |
55 error_func('Unable to create test run for %s tests in %s environment' | 57 error_func('Unable to create test run for %s tests in %s environment' |
56 % (str(test_instance), str(env))) | 58 % (str(test_instance), str(env))) |
57 | 59 |
OLD | NEW |