зеркало из https://github.com/mozilla/gecko-dev.git
Bug 681810 - Avoid xpcshell test failure when device not rooted and cp not available; r=jmaher
This commit is contained in:
Родитель
134e9f8707
Коммит
942d20b453
|
@ -13,6 +13,7 @@ class DeviceManagerADB(DeviceManager):
|
|||
self.retries = 0
|
||||
self._sock = None
|
||||
self.useRunAs = False
|
||||
self.packageName = None
|
||||
if packageName == None:
|
||||
if os.getenv('USER'):
|
||||
packageName = 'org.mozilla.fennec_' + os.getenv('USER')
|
||||
|
|
|
@ -195,7 +195,9 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
|
|||
shellArgs = "cd "+self.remoteHere
|
||||
shellArgs += "; LD_LIBRARY_PATH="+self.remoteBinDir
|
||||
shellArgs += "; export CACHE_PATH="+self.remoteBinDir
|
||||
shellArgs += "; export GRE_HOME="+self.device.getAppRoot()
|
||||
if (self.device.getAppRoot()):
|
||||
# xpcshell still runs without GRE_HOME; it may not be necessary
|
||||
shellArgs += "; export GRE_HOME="+self.device.getAppRoot()
|
||||
shellArgs += "; export XPCSHELL_TEST_PROFILE_DIR="+self.profileDir
|
||||
shellArgs += "; "+xpcshell+" "
|
||||
shellArgs += " ".join(cmd[1:])
|
||||
|
|
Загрузка…
Ссылка в новой задаче