wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1075487 - make get_b2g_pid get the right pid, r=davehunt,mdas

Browse Source
This commit is contained in:
Zac Campbell 2014-10-07 13:11:04 +01:00
parent e92cfa60de
commit 6054df5309
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/marionette/client/marionette/runner/mixins/b2g.py
View File

@ -27,9 +27,9 @@ def get_dm(marionette=None,**kwargs):
def get_b2g_pid(dm):
b2g_output = dm.shellCheckOutput(['b2g-ps'])
pid_re = re.compile(r"""[\s\S]*root[\s]*([\d]+)[\s]*(?:[\w]*[\s]*){6}/system/b2g/b2g""")
if '/system/b2g/b2g' in b2g_output:
pid = pid_re.match(b2g_output)
pid_re = re.compile(r"""b2g[\s]+0[\s]+root\s+([\d]+).*/system/b2g/b2g""")
pid = pid_re.match(b2g_output)
if pid:
return pid.group(1)