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

framwork/target: parameterize disabling of SELinux

Browse Source 
Add a parameter to optionally not attempt to disable SELinux as that can
cause problems on some platforms.
This commit is contained in:
Sergei Trofimov 2018-02-22 11:17:05 +00:00 committed by setrofim
parent cec3eaa375
commit 0728f35cbe
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wa/framework/target/assistant.py
View File

@ -31,6 +31,12 @@ class LinuxAssistant(object):
class AndroidAssistant(object): class AndroidAssistant(object):
parameters = [ parameters = [
Parameter('disable_selinux', kind=bool, default=True,
description="""
If ``True``, the default, and the target is rooted, an attempt will
be made to disable SELinux by running ``setenforce 0`` on the target
at the beginning of the run.
"""),
Parameter('logcat_poll_period', kind=int, Parameter('logcat_poll_period', kind=int,
constraint=lambda x: x > 0, constraint=lambda x: x > 0,
description=""" description="""
@ -47,12 +53,13 @@ class AndroidAssistant(object):
"""), """),
] ]
def __init__(self, target, logcat_poll_period=None): def __init__(self, target, logcat_poll_period=None, disable_selinux=True):
self.target = target self.target = target
self.logcat_poll_period = logcat_poll_period self.logcat_poll_period = logcat_poll_period
self.disable_selinux = disable_selinux
self.logcat_poller = None self.logcat_poller = None
if self.target.is_rooted: if self.target.is_rooted and self.disable_selinux:
self.disable_selinux() self.do_disable_selinux()
def start(self): def start(self):
if self.logcat_poll_period: if self.logcat_poll_period:
@ -79,7 +86,7 @@ class AndroidAssistant(object):
if self.logcat_poller: if self.logcat_poller:
self.logcat_poller.clear_buffer() self.logcat_poller.clear_buffer()
def disable_selinux(self): def do_disable_selinux(self):
# SELinux was added in Android 4.3 (API level 18). Trying to # SELinux was added in Android 4.3 (API level 18). Trying to
# 'getenforce' in earlier versions will produce an error. # 'getenforce' in earlier versions will produce an error.
if self.target.get_sdk_version() >= 18: if self.target.get_sdk_version() >= 18: