sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-19 04:21:17 +00:00
Code Issues Releases Wiki Activity

sysfile_getter: use self.device.busybox rather than just "busybox"

Browse Source 
Was breaking when location into which busybox was installed  was not in
PATH.
This commit is contained in:
Sergei Trofimov 2015-06-16 17:02:23 +01:00
parent 4eb0d9d750
commit b98b31a427
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wlauto/instrumentation/misc/__init__.py
View File

@ -130,7 +130,7 @@ class SysfsExtractor(Instrument):
dest_dir = self.device.path.join(self.on_device_before, as_relative(d)) dest_dir = self.device.path.join(self.on_device_before, as_relative(d))
if '*' in dest_dir: if '*' in dest_dir:
dest_dir = self.device.path.dirname(dest_dir) dest_dir = self.device.path.dirname(dest_dir)
self.device.execute('busybox cp -Hr {} {}'.format(d, dest_dir), self.device.execute('{} cp -Hr {} {}'.format(self.device.busybox, d, dest_dir),
as_root=True, check_exit_code=False) as_root=True, check_exit_code=False)
else: # not rooted else: # not rooted
for dev_dir, before_dir, _, _ in self.device_and_host_paths: for dev_dir, before_dir, _, _ in self.device_and_host_paths:
@ -142,7 +142,7 @@ class SysfsExtractor(Instrument):
dest_dir = self.device.path.join(self.on_device_after, as_relative(d)) dest_dir = self.device.path.join(self.on_device_after, as_relative(d))
if '*' in dest_dir: if '*' in dest_dir:
dest_dir = self.device.path.dirname(dest_dir) dest_dir = self.device.path.dirname(dest_dir)
self.device.execute('busybox cp -Hr {} {}'.format(d, dest_dir), self.device.execute('{} cp -Hr {} {}'.format(self.device.busybox, d, dest_dir),
as_root=True, check_exit_code=False) as_root=True, check_exit_code=False)
else: # not using tmpfs else: # not using tmpfs
for dev_dir, _, after_dir, _ in self.device_and_host_paths: for dev_dir, _, after_dir, _ in self.device_and_host_paths:
@ -152,7 +152,9 @@ class SysfsExtractor(Instrument):
if self.use_tmpfs: if self.use_tmpfs:
on_device_tarball = self.device.path.join(self.device.working_directory, self.tarname) on_device_tarball = self.device.path.join(self.device.working_directory, self.tarname)
on_host_tarball = self.device.path.join(context.output_directory, self.tarname) on_host_tarball = self.device.path.join(context.output_directory, self.tarname)
self.device.execute('busybox tar czf {} -C {} .'.format(on_device_tarball, self.tmpfs_mount_point), self.device.execute('{} tar czf {} -C {} .'.format(self.device.busybox,
on_device_tarball,
self.tmpfs_mount_point),
as_root=True) as_root=True)
self.device.execute('chmod 0777 {}'.format(on_device_tarball), as_root=True) self.device.execute('chmod 0777 {}'.format(on_device_tarball), as_root=True)
self.device.pull_file(on_device_tarball, on_host_tarball) self.device.pull_file(on_device_tarball, on_host_tarball)