Attachment #352918 for bug #474978

View | Details | Raw Unified | Return to bug 474978
Collapse All | Expand All

Lines 201-207 Link Here

(-)client.mk.orig (-1 / +1 lines)
201	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1	201	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1
202	$(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=	202	$(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
203	rm -f ${PGO_OBJDIR}/jarlog/en-US.log	203	rm -f ${PGO_OBJDIR}/jarlog/en-US.log
204	MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 $(MAKE) -C $(PGO_OBJDIR) pgo-profile-run	204	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
205	$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild	205	$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild
206	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1	206	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1
207		207




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

        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,

    # 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)


Return to bug 474978

Lines 24-48 Link Here

(-)automation.py.in.orig (-27 lines)
24	sys.path.insert(0, SCRIPT_DIR)	24	sys.path.insert(0, SCRIPT_DIR)
25	import automationutils	25	import automationutils
26		26
27	# --------------------------------------------------------------
28	# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900
29	#
30	here = os.path.dirname(__file__)
31	mozbase = os.path.realpath(os.path.join(os.path.dirname(here), 'mozbase'))
32
33	try:
34	import mozcrash
35	except:
36	deps = ['mozcrash',
37	'mozfile',
38	'mozlog']
39	for dep in deps:
40	module = os.path.join(mozbase, dep)
41	if module not in sys.path:
42	sys.path.append(module)
43	import mozcrash
44	# ---------------------------------------------------------------
45
46	_DEFAULT_WEB_SERVER = "127.0.0.1"	27	_DEFAULT_WEB_SERVER = "127.0.0.1"
47	_DEFAULT_HTTP_PORT = 8888	28	_DEFAULT_HTTP_PORT = 8888
48	_DEFAULT_SSL_PORT = 4443	29	_DEFAULT_SSL_PORT = 4443
Lines 1161-1169 Link Here
1161	self.killPid(processPID)	1142	self.killPid(processPID)
1162	return foundZombie	1143	return foundZombie
1163		1144
1164	def checkForCrashes(self, profileDir, symbolsPath):
1165	return mozcrash.check_for_crashes(os.path.join(profileDir, "minidumps"), symbolsPath, test_name=self.lastTestSeen)
1166
1167	def runApp(self, testURL, env, app, profileDir, extraArgs,	1145	def runApp(self, testURL, env, app, profileDir, extraArgs,
1168	runSSLTunnel = False, utilityPath = None,	1146	runSSLTunnel = False, utilityPath = None,
1169	xrePath = None, certPath = None,	1147	xrePath = None, certPath = None,
Lines 1236-1246 Link Here
1236	# Do a final check for zombie child processes.	1214	# Do a final check for zombie child processes.
1237	zombieProcesses = self.checkForZombies(processLog)	1215	zombieProcesses = self.checkForZombies(processLog)
1238		1216
1239	crashed = self.checkForCrashes(profileDir, symbolsPath)
1240
1241	if crashed or zombieProcesses:
1242	status = 1
1243
1244	if os.path.exists(processLog):	1217	if os.path.exists(processLog):
1245	os.unlink(processLog)	1218	os.unlink(processLog)
1246		1219