diff options
Diffstat (limited to 'catapult/devil/bin/run_py_devicetests')
| -rwxr-xr-x | catapult/devil/bin/run_py_devicetests | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/catapult/devil/bin/run_py_devicetests b/catapult/devil/bin/run_py_devicetests index c23839f3..656bedf2 100755 --- a/catapult/devil/bin/run_py_devicetests +++ b/catapult/devil/bin/run_py_devicetests @@ -10,14 +10,23 @@ _CATAPULT_PATH = os.path.abspath(os.path.join( os.path.dirname(__file__), '..', '..')) _DEVIL_PATH = os.path.abspath(os.path.join( os.path.dirname(__file__), '..')) +_TYP_PATH = os.path.abspath(os.path.join(_CATAPULT_PATH, 'third_party', 'typ')) -sys.path.append(_CATAPULT_PATH) -from catapult_build import run_with_typ +sys.path.append(_TYP_PATH) +import typ + +sys.path.append(_DEVIL_PATH) +from devil.android import device_test_case def main(): - sys.argv.extend(['--suffixes', '*_devicetest.py', '-j', '1']) - return run_with_typ.Run(top_level_dir=_DEVIL_PATH) + runner = typ.Runner() + runner.setup_fn = device_test_case.PrepareDevices + return runner.main( + coverage_source=[_DEVIL_PATH], + jobs=1, + suffixes=['*_devicetest.py'], + top_level_dir=_DEVIL_PATH) if __name__ == '__main__': sys.exit(main()) |