| Index: build/android/pylib/base/test_run_factory.py
|
| diff --git a/build/android/pylib/base/test_run_factory.py b/build/android/pylib/base/test_run_factory.py
|
| index 1a2872819d9c2fd09551f1017a320cb7a8e147e2..a6cfe9b791030c7fd6192a8f0ec2ee4b4e81a403 100644
|
| --- a/build/android/pylib/base/test_run_factory.py
|
| +++ b/build/android/pylib/base/test_run_factory.py
|
| @@ -18,39 +18,41 @@ from pylib.local.machine import local_machine_junit_test_run
|
| from pylib.perf import perf_test_instance
|
|
|
|
|
| -def _CreatePerfTestRun(args, env, test_instance):
|
| +def _CreatePerfTestRun(args, env, test_instance, test_output_saver):
|
| if args.print_step:
|
| return local_device_perf_test_run.PrintStep(
|
| - env, test_instance)
|
| + env, test_instance, test_output_saver)
|
| elif args.output_json_list:
|
| return local_device_perf_test_run.OutputJsonList(
|
| - env, test_instance)
|
| + env, test_instance, test_output_saver)
|
| return local_device_perf_test_run.LocalDevicePerfTestRun(
|
| - env, test_instance)
|
| + env, test_instance, test_output_saver)
|
|
|
|
|
| -def CreateTestRun(args, env, test_instance, error_func):
|
| +def CreateTestRun(args, env, test_instance, test_output_saver, error_func):
|
| if isinstance(env, local_device_environment.LocalDeviceEnvironment):
|
| if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
|
| - return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance)
|
| + return local_device_gtest_run.LocalDeviceGtestRun(
|
| + env, test_instance, test_output_saver)
|
| if isinstance(test_instance,
|
| instrumentation_test_instance.InstrumentationTestInstance):
|
| return (local_device_instrumentation_test_run
|
| - .LocalDeviceInstrumentationTestRun(env, test_instance))
|
| + .LocalDeviceInstrumentationTestRun(
|
| + env, test_instance, test_output_saver))
|
| if isinstance(test_instance, linker_test_instance.LinkerTestInstance):
|
| return (local_device_linker_test_run
|
| - .LocalDeviceLinkerTestRun(env, test_instance))
|
| + .LocalDeviceLinkerTestRun(env, test_instance, test_output_saver))
|
| if isinstance(test_instance, monkey_test_instance.MonkeyTestInstance):
|
| return (local_device_monkey_test_run
|
| - .LocalDeviceMonkeyTestRun(env, test_instance))
|
| + .LocalDeviceMonkeyTestRun(env, test_instance, test_output_saver))
|
| if isinstance(test_instance,
|
| perf_test_instance.PerfTestInstance):
|
| - return _CreatePerfTestRun(args, env, test_instance)
|
| + return _CreatePerfTestRun(args, env, test_instance, test_output_saver)
|
|
|
| if isinstance(env, local_machine_environment.LocalMachineEnvironment):
|
| if isinstance(test_instance, junit_test_instance.JunitTestInstance):
|
| return (local_machine_junit_test_run
|
| - .LocalMachineJunitTestRun(env, test_instance))
|
| + .LocalMachineJunitTestRun(env, test_instance, test_output_saver))
|
|
|
| error_func('Unable to create test run for %s tests in %s environment'
|
| % (str(test_instance), str(env)))
|
|
|