Changes argument passing to use options objects

build/android/pylib/gtest/setup.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generates test runner factory and tests for GTests."""
 
 import fnmatch
 import glob
 import logging
 import os
@@ skipping 239 matching lines @@
       tests, bool(gtest_filter), bool(gtest_filter))
   tests = unittest_util.FilterTestNames(
       tests, _GetDisabledTestsFilterFromFile(suite_name))
 
   if gtest_filter:
     tests = unittest_util.FilterTestNames(tests, gtest_filter)
 
   return tests
 
 
-def Setup(suite_name, test_arguments, timeout,
-          cleanup_test_files, tool, build_type, push_deps,
-          gtest_filter):
+def Setup(test_options):
   """Create the test runner factory and tests.
 
   Args:
-    suite_name: The suite name specified on the command line.
-    test_arguments: Additional arguments to pass to the test binary.
-    timeout: Timeout for each test.
-    cleanup_test_files: Whether or not to cleanup test files on device.
-    tool: Name of the Valgrind tool.
-    build_type: 'Release' or 'Debug'.
-    push_deps: If True, push all dependencies to the device.
-    gtest_filter: Filter for tests.
+    test_options: A GTestOptions object containing all options relevant to
+        running gtests.
 
   Returns:
     A tuple of (TestRunnerFactory, tests).
   """
 
+  suite_name = test_options.suite_name
+  build_type = test_options.build_type
+  gtest_filter = test_options.gtest_filter
+
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
   test_package = test_package_apk.TestPackageApk(suite_name, build_type)
   if not os.path.exists(test_package.suite_path):
     test_package = test_package_exe.TestPackageExecutable(
         suite_name, build_type)
     if not os.path.exists(test_package.suite_path):
       raise Exception(
           'Did not find %s target. Ensure it has been built.' % suite_name)
   logging.warning('Found target %s', test_package.suite_path)
 
   _GenerateDepsDirUsingIsolate(suite_name, build_type)
 
   # Constructs a new TestRunner with the current options.
   def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(
+        test_options,
         device,
-        test_package,
-        test_arguments,
-        timeout,
-        cleanup_test_files,
-        tool,
-        build_type,
-        push_deps)
+        test_package)
 
   attached_devices = android_commands.GetAttachedDevices()
   tests = _GetTestsFiltered(suite_name, gtest_filter,
                             TestRunnerFactory, attached_devices)
   # Coalesce unit tests into a single test per device
   if suite_name != 'content_browsertests':
     num_devices = len(attached_devices)
     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]
     tests = [t for t in tests if t]
 
   return (TestRunnerFactory, tests)