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

Side by Side Diff: build/android/pylib/base/test_instance_factory.py

Issue 2492123002: [android] Stop using isolate.py for data dependency management. (Closed)
Patch Set: add runtime_deps to data Created 4 years, 1 month 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 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.perf import perf_test_instance 8 from pylib.perf import perf_test_instance
9 from pylib.utils import isolator 9 from pylib.utils import device_dependencies
10 10
11 11
12 def CreateTestInstance(args, error_func): 12 def CreateTestInstance(args, error_func):
13 13
14 if args.command == 'gtest': 14 if args.command == 'gtest':
15 return gtest_test_instance.GtestTestInstance( 15 return gtest_test_instance.GtestTestInstance(
16 args, isolator.Isolator(), error_func) 16 args, device_dependencies.GetDataDependencies, error_func)
17 elif args.command == 'instrumentation': 17 elif args.command == 'instrumentation':
18 return instrumentation_test_instance.InstrumentationTestInstance( 18 return instrumentation_test_instance.InstrumentationTestInstance(
19 args, isolator.Isolator(), error_func) 19 args, device_dependencies.GetDataDependencies, error_func)
20 elif args.command == 'junit': 20 elif args.command == 'junit':
21 return junit_test_instance.JunitTestInstance(args, error_func) 21 return junit_test_instance.JunitTestInstance(args, error_func)
22 elif args.command == 'perf': 22 elif args.command == 'perf':
23 return perf_test_instance.PerfTestInstance(args, error_func) 23 return perf_test_instance.PerfTestInstance(args, error_func)
24 24
25 error_func('Unable to create %s test instance.' % args.command) 25 error_func('Unable to create %s test instance.' % args.command)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698