sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-02 03:12:34 +01:00
Code Issues Releases Wiki Activity

pull more stuff during run initialization

Browse Source 
added more paths to pull by default when device.get_properties is
invoked during run initialization. Also moved the LinuxDevice
implementation into BaseLinuxDevice, so that AndroidDevice tires to pull
the same files (on top of the Android-specific stuff).
This commit is contained in:
Sergei Trofimov
2015-06-01 16:41:33 +01:00
parent ead0be2763
commit b4971d76d6
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wlauto/common/android/device.py
View File

@@ -478,7 +478,7 @@ class AndroidDevice(BaseLinuxDevice): # pylint: disable=W0223
def get_properties(self, context):
"""Captures and saves the information from /system/build.prop and /proc/version"""
props = {}
props = super(AndroidDevice, self).get_properties(context)
props['android_id'] = self.get_android_id()
buildprop_file = os.path.join(context.host_working_directory, 'build.prop')
if not os.path.isfile(buildprop_file):
@@ -486,12 +486,6 @@ class AndroidDevice(BaseLinuxDevice): # pylint: disable=W0223
self._update_build_properties(buildprop_file, props)
context.add_run_artifact('build_properties', buildprop_file, 'export')
version_file = os.path.join(context.host_working_directory, 'version')
if not os.path.isfile(version_file):
self.pull_file('/proc/version', context.host_working_directory)
self._update_versions(version_file, props)
context.add_run_artifact('device_version', version_file, 'export')
dumpsys_window_file = os.path.join(context.host_working_directory, 'window.dumpsys')
dumpsys_window_output = self.execute('dumpsys window')
with open(dumpsys_window_file, 'w') as wfh: