diff -ruN mozilla-release~/build/automation.py.in mozilla-release/build/automation.py.in --- mozilla-release~/build/automation.py.in 2013-07-30 21:40:47.000000000 +0300 +++ mozilla-release/build/automation.py.in 2013-08-07 22:43:34.895190142 +0300 @@ -24,25 +24,6 @@ sys.path.insert(0, SCRIPT_DIR) import automationutils -# -------------------------------------------------------------- -# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900 -# -here = os.path.dirname(__file__) -mozbase = os.path.realpath(os.path.join(os.path.dirname(here), 'mozbase')) - -try: - import mozcrash -except: - deps = ['mozcrash', - 'mozfile', - 'mozlog'] - for dep in deps: - module = os.path.join(mozbase, dep) - if module not in sys.path: - sys.path.append(module) - import mozcrash -# --------------------------------------------------------------- - _DEFAULT_PREFERENCE_FILE = os.path.join(SCRIPT_DIR, 'prefs_general.js') _DEFAULT_WEB_SERVER = "127.0.0.1" @@ -1058,9 +1039,6 @@ self.killAndGetStack(processPID, utilityPath, debuggerInfo) return foundZombie - def checkForCrashes(self, minidumpDir, symbolsPath): - return mozcrash.check_for_crashes(minidumpDir, symbolsPath, test_name=self.lastTestSeen) - def runApp(self, testURL, env, app, profileDir, extraArgs, runSSLTunnel = False, utilityPath = None, xrePath = None, certPath = None, @@ -1133,11 +1111,6 @@ # Do a final check for zombie child processes. zombieProcesses = self.checkForZombies(processLog, utilityPath, debuggerInfo) - crashed = self.checkForCrashes(os.path.join(profileDir, "minidumps"), symbolsPath) - - if crashed or zombieProcesses: - status = 1 - if os.path.exists(processLog): os.unlink(processLog) diff -ruN mozilla-release~/client.mk mozilla-release/client.mk --- mozilla-release~/client.mk 2013-07-30 21:40:47.000000000 +0300 +++ mozilla-release/client.mk 2013-08-07 22:42:12.754374111 +0300 @@ -201,7 +201,7 @@ $(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1 $(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT= rm -f ${PGO_OBJDIR}/jarlog/en-US.log - MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 $(MAKE) -C $(PGO_OBJDIR) pgo-profile-run + MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 topsrcdir=$(TOPSRCDIR) DEPTH=. PYTHON=python $(MAKE) -C $(PGO_OBJDIR) -f $(TOPSRCDIR)/testing/testsuite-targets.mk pgo-profile-run $(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild $(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1