Index: build/android/pylib/instrumentation/test_runner.py |
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py |
index a2692faf65e6c1608765fcb6bff815639150b2c0..aef89cfacd1326fd057fd045ed07958e8a4ce422 100644 |
--- a/build/android/pylib/instrumentation/test_runner.py |
+++ b/build/android/pylib/instrumentation/test_runner.py |
@@ -58,7 +58,6 @@ class TestRunner(base_test_runner.BaseTestRunner): |
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 |
@@ -86,11 +85,12 @@ class TestRunner(base_test_runner.BaseTestRunner): |
self.disable_assertions = options.disable_assertions |
self.test_pkg = test_pkg |
self.ports_to_forward = ports_to_forward |
- self.install_apk = options.install_apk |
#override |
def InstallTestPackage(self): |
- if self.install_apk: |
+ installed_apk_path = self.adb.GetApplicationPath( |
+ self.test_pkg.GetPackageName()) |
+ if not self.adb.CheckMd5Sum(self.test_pkg.GetApkPath(), installed_apk_path): |
frankf
2013/07/19 21:53:54
This seems generic enough to be part of *Install m
craigdh
2013/07/19 23:38:38
Done.
|
self.test_pkg.Install(self.adb) |
#override |