LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix runtest local.prop handling.

Browse Source 
Change-Id: Iec8d942fc11d46bdd54f55485aedb4b0021afee3
This commit is contained in:
Brett Chabot
2012-02-16 15:51:43 -08:00
parent 8bd3426b97
commit 25dfd79b2e
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
testrunner/runtest.py
View File

@@ -385,12 +385,26 @@ class TestRunner(object):
if self._options.preview: if self._options.preview:
logger.Log("adb shell \"echo %s >> /data/local.prop\"" logger.Log("adb shell \"echo %s >> /data/local.prop\""
% self._DALVIK_VERIFIER_OFF_PROP) % self._DALVIK_VERIFIER_OFF_PROP)
logger.Log("adb shell chmod 644 /data/local.prop")
logger.Log("adb reboot") logger.Log("adb reboot")
logger.Log("adb wait-for-device") logger.Log("adb wait-for-device")
else: else:
logger.Log("Turning off dalvik verifier and rebooting") logger.Log("Turning off dalvik verifier and rebooting")
self._adb.SendShellCommand("\"echo %s >> /data/local.prop\"" self._adb.SendShellCommand("\"echo %s >> /data/local.prop\""
% self._DALVIK_VERIFIER_OFF_PROP) % self._DALVIK_VERIFIER_OFF_PROP)
self._ChmodReboot()
elif not self._options.preview:
# check the permissions on the file
permout = self._adb.SendShellCommand("ls -l /data/local.prop")
if not "-rw-r--r--" in permout:
logger.Log("Fixing permissions on /data/local.prop and rebooting")
self._ChmodReboot()
def _ChmodReboot(self):
"""Perform a chmod of /data/local.prop and reboot.
"""
self._adb.SendShellCommand("chmod 644 /data/local.prop")
self._adb.SendCommand("reboot") self._adb.SendCommand("reboot")
# wait for device to go offline # wait for device to go offline
time.sleep(10) time.sleep(10)
@@ -398,6 +412,7 @@ class TestRunner(object):
retry_count=3) retry_count=3)
self._adb.EnableAdbRoot() self._adb.EnableAdbRoot()
def RunTests(self): def RunTests(self):
"""Main entry method - executes the tests according to command line args.""" """Main entry method - executes the tests according to command line args."""
try: try: