Attachment #355418 for bug #480258

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

Lines 28-34 Link Here

(-)mozilla-release/build/automation.py.in~ (-1 / +1 lines)
28	# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900	28	# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900
29	#	29	#
30	here = os.path.dirname(__file__)	30	here = os.path.dirname(__file__)
31	mozbase = os.path.realpath(os.path.join(os.path.dirname(here), 'mozbase'))	31	mozbase = os.path.realpath(os.path.join(os.path.dirname(here), '../../testing/mozbase'))
32		32
33	try:	33	try:
34	import mozcrash	34	import mozcrash

Return to bug 480258