--- a/build/mobile/remoteautomation.py
+++ b/build/mobile/remoteautomation.py
@@ -145,19 +145,19 @@ class RemoteAutomation(Automation):
def checkForANRs(self):
traces = "/data/anr/traces.txt"
if self._devicemanager.fileExists(traces):
try:
t = self._devicemanager.pullFile(traces)
if t:
stripped = t.strip()
- if len(stripped) > 0:
- print "Contents of %s:" % traces
- print t
+ #if len(stripped) > 0:
+ # print "Contents of %s:" % traces
+ # print t
# Once reported, delete traces
self.deleteANRs()
except DMError:
print "Error pulling %s" % traces
except IOError:
print "Error pulling %s" % traces
else:
print "%s not found" % traces
--- a/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
+++ b/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
@@ -425,26 +425,28 @@ class DeviceManagerADB(DeviceManager):
if args != "":
acmd.append("--es")
acmd.append("args")
acmd.append(args)
if env != '' and env is not None:
envCnt = 0
# env is expected to be a dict of environment variables
for envkey, envval in env.iteritems():
- acmd.append("--es")
- acmd.append("env" + str(envCnt))
- acmd.append(envkey + "=" + envval)
- envCnt += 1
+ if envkey != "MOZ_PROCESS_LOG":
+ acmd.append("--es")
+ acmd.append("env" + str(envCnt))
+ acmd.append(envkey + "=" + envval)
+ envCnt += 1
if uri != "":
acmd.append("-d")
acmd.append(uri)
acmd = ["shell", ' '.join(map(lambda x: '"' + x + '"', ["am", "start"] + acmd))]
self._logger.info(acmd)
+ print(acmd)
self._checkCmd(acmd)
return outputFile
def killProcess(self, appname, sig=None):
try:
self.shellCheckOutput(["am", "force-stop", appname], timeout=self.short_timeout)
except:
# no problem - will kill it instead