Change Android build configurations (step 2).

build/android/pylib/run_java_tests.py

 # Copyright (c) 2012 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.
 
 """Runs the Java tests. See more information on run_instrumentation_tests.py."""
 
 import fnmatch
 import logging
 import os
 import re
@@ skipping 71 matching lines @@
   _DEVICE_PERF_OUTPUT_SEARCH_PREFIX = (_DEVICE_PERF_OUTPUT_DIR +
                                        'chrome-profile*')
   _DEVICE_HAS_TEST_FILES = {}
 
   def __init__(self, options, device, tests_iter, coverage, shard_index, apks,
                ports_to_forward):
     """Create a new TestRunner.
 
     Args:
       options: An options object with the following required attributes:
+      -  build_type: 'Release' or 'Debug'.
       -  install_apk: Re-installs the apk if opted.
       -  save_perf_json: Whether or not to save the JSON file from UI perf
             tests.
       -  screenshot_failures: Take a screenshot for a test failure
       -  tool: Name of the Valgrind tool.
       -  wait_for_debugger: blocks until the debugger is connected.
       device: Attached android device.
       tests_iter: A list of tests to be run.
       coverage: Collects coverage information if opted.
       shard_index: shard # for this TestRunner, used to create unique port
           numbers.
       apks: A list of ApkInfo objects need to be installed. The first element
             should be the tests apk, the rests could be the apks used in test.
             The default is ChromeTest.apk.
       ports_to_forward: A list of port numbers for which to set up forwarders.
                         Can be optionally requested by a test case.
     Raises:
       FatalTestException: if coverage metadata is not available.
     """
-    BaseTestRunner.__init__(self, device, options.tool, shard_index)
+    BaseTestRunner.__init__(
+        self, device, options.tool, shard_index, options.build_type)
 
     if not apks:
       apks = [apk_info.ApkInfo(options.test_apk_path,
                                options.test_apk_jar_path)]
 
+    self.build_type = options.build_type
     self.install_apk = options.install_apk
     self.save_perf_json = options.save_perf_json
     self.screenshot_failures = options.screenshot_failures
     self.wait_for_debugger = options.wait_for_debugger
 
     self.tests_iter = tests_iter
     self.coverage = coverage
     self.apks = apks
     self.test_apk = apks[0]
     self.instrumentation_class_path = self.test_apk.GetPackageName()
@@ skipping 134 matching lines @@
     # This line *must* come before the forwarding below, as it nukes all
     # the other forwarders. A more comprehensive fix might be to pull the
     # forwarder-killing line up to here, but that might violate assumptions
     # implicit in other places.
     self.LaunchTestHttpServer(os.path.join(constants.CHROME_DIR),
                               (constants.LIGHTTPD_RANDOM_PORT_FIRST +
                                self.shard_index))
 
     if self.ports_to_forward:
       for port in self.ports_to_forward:
-        self.forwarders.append(
-            Forwarder(self.adb, [(port, port)], self.tool, '127.0.0.1'))
+        self.forwarders.append(Forwarder(
+            self.adb, [(port, port)], self.tool, '127.0.0.1', self.build_type))
     self.CopyTestFilesOnce()
     self.flags.AddFlags(['--enable-test-intents'])
 
   def TearDown(self):
     """Cleans up the test harness and saves outstanding data from test run."""
     if self.forwarders:
       for forwarder in self.forwarders:
         forwarder.Close()
     self.GenerateCoverageReportIfNeeded()
     super(TestRunner, self).TearDown()
@@ skipping 302 matching lines @@
   if (len(attached_devices) > 1 and
       not coverage and
       not options.wait_for_debugger):
     sharder = TestSharder(attached_devices, options, tests, apks)
     test_results = sharder.RunShardedTests()
   else:
     runner = TestRunner(options, attached_devices[0], tests, coverage, 0, apks,
                         [])
     test_results = runner.Run()
   return test_results