[patch] pgo fix

ffox-pgo.patch (text/plain), 2.42 KB, created by victor romanchuk on 2013-07-09 10:38:51 UTC

--- client.mk.orig	2013-07-02 06:56:49.571431047 +0400
+++ mozilla-release/client.mk	2013-07-07 15:54:55.489527635 +0400
@@ -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
 
--- automation.py.in.orig	2013-06-18 15:01:13.000000000 +0400
+++ mozilla-release/build/automation.py.in	2013-07-07 17:31:17.421246417 +0400
@@ -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_WEB_SERVER = "127.0.0.1"
 _DEFAULT_HTTP_PORT = 8888
 _DEFAULT_SSL_PORT = 4443
@@ -1161,9 +1142,6 @@
         self.killPid(processPID)
     return foundZombie
 
-  def checkForCrashes(self, profileDir, symbolsPath):
-    return mozcrash.check_for_crashes(os.path.join(profileDir, "minidumps"), symbolsPath, test_name=self.lastTestSeen)
-
   def runApp(self, testURL, env, app, profileDir, extraArgs,
              runSSLTunnel = False, utilityPath = None,
              xrePath = None, certPath = None,
@@ -1236,11 +1214,6 @@
     # Do a final check for zombie child processes.
     zombieProcesses = self.checkForZombies(processLog)
 
-    crashed = self.checkForCrashes(profileDir, symbolsPath)
-
-    if crashed or zombieProcesses:
-      status = 1
-
     if os.path.exists(processLog):
       os.unlink(processLog)