| Index: build/android/pylib/base_test_sharder.py
|
| diff --git a/build/android/pylib/base_test_sharder.py b/build/android/pylib/base_test_sharder.py
|
| index 5306769155050ba032364650daeecaa1581e609b..c884df1894c5df71671f2c17cc496b0c1c2b532e 100644
|
| --- a/build/android/pylib/base_test_sharder.py
|
| +++ b/build/android/pylib/base_test_sharder.py
|
| @@ -7,6 +7,7 @@ import android_commands
|
| import logging
|
| import multiprocessing
|
|
|
| +from forwarder import Forwarder
|
| from test_result import TestResults
|
|
|
|
|
| @@ -41,10 +42,11 @@ class BaseTestSharder(object):
|
| # See more in SetTestsContainer.
|
| tests_container = None
|
|
|
| - def __init__(self, attached_devices):
|
| + def __init__(self, attached_devices, build_type='Debug'):
|
| self.attached_devices = attached_devices
|
| self.retries = 1
|
| self.tests = []
|
| + self.build_type = build_type
|
|
|
| def CreateShardedTestRunner(self, device, index):
|
| """Factory function to create a suite-specific test runner.
|
| @@ -60,11 +62,11 @@ class BaseTestSharder(object):
|
|
|
| def SetupSharding(self, tests):
|
| """Called before starting the shards."""
|
| - pass
|
| + Forwarder(None, self.build_type).KillHostForwarder()
|
|
|
| def OnTestsCompleted(self, test_runners, test_results):
|
| """Notifies that we completed the tests."""
|
| - pass
|
| + Forwarder(None, self.build_type).KillHostForwarder()
|
|
|
| def RunShardedTests(self):
|
| """Runs the tests in all connected devices.
|
|
|