diff options
| author | Brett Chabot <brettchabot@google.com> | 2012-08-31 18:39:00 -0700 |
|---|---|---|
| committer | Brett Chabot <brettchabot@google.com> | 2012-08-31 18:55:15 -0700 |
| commit | 7454171f1755187a2f3d0a8d9d7229a638b32f01 (patch) | |
| tree | 7ccb37ad104cd0fc151638bff0461f86179a4637 /testrunner/test_defs | |
| parent | 341b0892b74c3a1373326b428e0b3ba6fbdaa84d (diff) | |
| download | android_development-7454171f1755187a2f3d0a8d9d7229a638b32f01.tar.gz android_development-7454171f1755187a2f3d0a8d9d7229a638b32f01.tar.bz2 android_development-7454171f1755187a2f3d0a8d9d7229a638b32f01.zip | |
Coverage and unbundling changes for runtest.
Stop using 'adb sync' in runtest. It was unreliable even when working
with full platform builds, and doesn't work at all for unbundled apps.
Instead, use output from build command to find produced artifacts and
use 'adb install' where possible.
However, note that this approach won't sync previously built artifacts
to device.
Also adjust to build system support for code coverage. Its no longer
required to build libcore to get code coverage.
Change-Id: I9c5d37897c9570d2d29db3ec82f5c53e60a8f485
Diffstat (limited to 'testrunner/test_defs')
| -rw-r--r-- | testrunner/test_defs/instrumentation_test.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/testrunner/test_defs/instrumentation_test.py b/testrunner/test_defs/instrumentation_test.py index ede7ceb26..12633b269 100644 --- a/testrunner/test_defs/instrumentation_test.py +++ b/testrunner/test_defs/instrumentation_test.py @@ -33,9 +33,6 @@ class InstrumentationTestSuite(test_suite.AbstractTestSuite): DEFAULT_RUNNER = "android.test.InstrumentationTestRunner" - # dependency on libcore (used for Emma) - _LIBCORE_BUILD_PATH = "libcore" - def __init__(self): test_suite.AbstractTestSuite.__init__(self) self._package_name = None @@ -87,8 +84,6 @@ class InstrumentationTestSuite(test_suite.AbstractTestSuite): return self def GetBuildDependencies(self, options): - if options.coverage: - return [self._LIBCORE_BUILD_PATH] return [] def Run(self, options, adb): @@ -145,8 +140,6 @@ class InstrumentationTestSuite(test_suite.AbstractTestSuite): logger.Log(adb_cmd) elif options.coverage: coverage_gen = coverage.CoverageGenerator(adb) - adb.WaitForInstrumentation(self.GetPackageName(), - self.GetRunnerName()) # need to parse test output to determine path to coverage file logger.Log("Running in coverage mode, suppressing test output") try: @@ -168,8 +161,6 @@ class InstrumentationTestSuite(test_suite.AbstractTestSuite): if coverage_file is not None: logger.Log("Coverage report generated at %s" % coverage_file) else: - adb.WaitForInstrumentation(self.GetPackageName(), - self.GetRunnerName()) adb.StartInstrumentationNoResults( package_name=self.GetPackageName(), runner_name=self.GetRunnerName(), |