diff options
Diffstat (limited to 'build/mobile')
| -rw-r--r-- | build/mobile/b2gautomation.py | 1 | ||||
| -rw-r--r-- | build/mobile/remoteautomation.py | 32 |
2 files changed, 2 insertions, 31 deletions
diff --git a/build/mobile/b2gautomation.py b/build/mobile/b2gautomation.py index d73edd419..e547bd6d2 100644 --- a/build/mobile/b2gautomation.py +++ b/build/mobile/b2gautomation.py @@ -157,7 +157,6 @@ class B2GRemoteAutomation(Automation): env = {} if crashreporter: - env['MOZ_CRASHREPORTER'] = '1' env['MOZ_CRASHREPORTER_NO_REPORT'] = '1' # We always hide the results table in B2G; it's much slower if we don't. diff --git a/build/mobile/remoteautomation.py b/build/mobile/remoteautomation.py index 1358e0dfe..26eedc85d 100644 --- a/build/mobile/remoteautomation.py +++ b/build/mobile/remoteautomation.py @@ -76,7 +76,6 @@ class RemoteAutomation(Automation): if crashreporter and not debugger: env['MOZ_CRASHREPORTER_NO_REPORT'] = '1' - env['MOZ_CRASHREPORTER'] = '1' else: env['MOZ_CRASHREPORTER_DISABLE'] = '1' @@ -215,36 +214,9 @@ class RemoteAutomation(Automation): if javaException: return True - # If crash reporting is disabled (MOZ_CRASHREPORTER!=1), we can't say - # anything. - if not self.CRASHREPORTER: - return False + # No crash reporting means we can't say anything. + return False - try: - dumpDir = tempfile.mkdtemp() - remoteCrashDir = posixpath.join(self._remoteProfile, 'minidumps') - if not self._devicemanager.dirExists(remoteCrashDir): - # If crash reporting is enabled (MOZ_CRASHREPORTER=1), the - # minidumps directory is automatically created when Fennec - # (first) starts, so its lack of presence is a hint that - # something went wrong. - print "Automation Error: No crash directory (%s) found on remote device" % remoteCrashDir - # Whilst no crash was found, the run should still display as a failure - return True - self._devicemanager.getDirectory(remoteCrashDir, dumpDir) - - logger = get_default_logger() - if logger is not None: - crashed = mozcrash.log_crashes(logger, dumpDir, symbolsPath, test=self.lastTestSeen) - else: - crashed = Automation.checkForCrashes(self, dumpDir, symbolsPath) - - finally: - try: - shutil.rmtree(dumpDir) - except: - print "WARNING: unable to remove directory: %s" % dumpDir - return crashed def buildCommandLine(self, app, debuggerInfo, profileDir, testURL, extraArgs): # If remote profile is specified, use that instead |