Index: bin/cros_run_parallel_vm_tests.py |
diff --git a/bin/cros_run_parallel_vm_tests.py b/bin/cros_run_parallel_vm_tests.py |
index 0c0b08b88ac0e6031d20cf0e00f967752bfa6a6d..2ca51a3afa25d3f0bcfdf62fa300716822d2f70a 100755 |
--- a/bin/cros_run_parallel_vm_tests.py |
+++ b/bin/cros_run_parallel_vm_tests.py |
@@ -27,7 +27,8 @@ class ParallelTestRunner(object): |
""" |
def __init__(self, tests, base_ssh_port=_DEFAULT_BASE_SSH_PORT, board=None, |
- image_path=None, order_output=False, results_dir_root=None): |
+ image_path=None, order_output=False, results_dir_root=None, |
+ use_emerged=False): |
"""Constructs and initializes the test runner class. |
Args: |
@@ -50,6 +51,7 @@ class ParallelTestRunner(object): |
self._image_path = image_path |
self._order_output = order_output |
self._results_dir_root = results_dir_root |
+ self._use_emerged = use_emerged |
def _SpawnTests(self): |
"""Spawns VMs and starts the test runs on them. |
@@ -75,6 +77,7 @@ class ParallelTestRunner(object): |
if self._results_dir_root: |
args.append('--results_dir_root=%s/%s.%d' % |
(self._results_dir_root, test, ssh_port)) |
+ if self._use_emerged: args.append('--use_emerged') |
Info('Running %r...' % args) |
output = None |
if self._order_output: |
@@ -142,6 +145,8 @@ def main(): |
parser.add_option('--results_dir_root', |
help='Root results directory. If none specified, each test ' |
'will store its results in a separate /tmp directory.') |
+ parser.add_option('--use_emerged', action='store_true', default=False, |
+ help='Force use of emerged autotest packages') |
(options, args) = parser.parse_args() |
if not args: |
@@ -150,7 +155,7 @@ def main(): |
runner = ParallelTestRunner(args, options.base_ssh_port, options.board, |
options.image_path, options.order_output, |
- options.results_dir_root) |
+ options.results_dir_root, options.use_emerged) |
runner.Run() |