Attachment #369974 for bug #480258

Lines 29-35 Link Here

(-)mozilla-release~/build/automation.py.in (-1 / +1 lines)
29	# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900	29	# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900
30	# These paths refer to relative locations to test.zip, not the OBJDIR or SRCDIR	30	# These paths refer to relative locations to test.zip, not the OBJDIR or SRCDIR
31	here = os.path.dirname(os.path.realpath(__file__))	31	here = os.path.dirname(os.path.realpath(__file__))
32	mozbase = os.path.realpath(os.path.join(os.path.dirname(here), 'mozbase'))	32	mozbase = os.path.realpath(os.path.join(os.path.dirname(here), '../../testing/mozbase'))
33		33
34	if os.path.isdir(mozbase):	34	if os.path.isdir(mozbase):
35	for package in os.listdir(mozbase):	35	for package in os.listdir(mozbase):




# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import sys

# Let's put all subdirectories under testing/mozbase/ and python/ here
for base in ['../testing/mozbase/', '../python/']:
    for d in next(os.walk(base))[1]:
        sys.path.append(os.path.join(os.path.dirname(__file__), '../' + base + d))

# And finally config/ itself
sys.path.append(os.path.join(os.path.dirname(__file__), '../../config'))

from mozprofile import FirefoxProfile, Profile, Preferences
from mozprofile.permissions import ServerLocations
from mozrunner import FirefoxRunner, CLI

import json
import socket
import threading
import os
import sys
import shutil
import tempfile
from datetime import datetime

Lines 238-244 Link Here

(-)mozilla-release~/client.mk (-1 / +1 lines)
238	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1	238	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1
239	$(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=	239	$(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
240	rm -f ${PGO_OBJDIR}/jarlog/en-US.log	240	rm -f ${PGO_OBJDIR}/jarlog/en-US.log
241	MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 $(MAKE) -C $(PGO_OBJDIR) pgo-profile-run	241	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
242	$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild	242	$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild
243	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1	243	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1
244		244

Return to bug 480258

Lines 4-9 Link Here

(-)mozilla-release~/build/pgo/profileserver.py (-2 / +11 lines)
4	# License, v. 2.0. If a copy of the MPL was not distributed with this	4	# License, v. 2.0. If a copy of the MPL was not distributed with this
5	# file, You can obtain one at http://mozilla.org/MPL/2.0/.	5	# file, You can obtain one at http://mozilla.org/MPL/2.0/.
6		6
		7	import os
		8	import sys
		9
		10	# Let's put all subdirectories under testing/mozbase/ and python/ here
		11	for base in ['../testing/mozbase/', '../python/']:
		12	for d in next(os.walk(base))[1]:
		13	sys.path.append(os.path.join(os.path.dirname(__file__), '../' + base + d))
		14
		15	# And finally config/ itself
		16	sys.path.append(os.path.join(os.path.dirname(__file__), '../../config'))
		17
7	from mozprofile import FirefoxProfile, Profile, Preferences	18	from mozprofile import FirefoxProfile, Profile, Preferences
8	from mozprofile.permissions import ServerLocations	19	from mozprofile.permissions import ServerLocations
9	from mozrunner import FirefoxRunner, CLI	20	from mozrunner import FirefoxRunner, CLI
Lines 11-18 Link Here
11	import json	22	import json
12	import socket	23	import socket
13	import threading	24	import threading
14	import os
15	import sys
16	import shutil	25	import shutil
17	import tempfile	26	import tempfile
18	from datetime import datetime	27	from datetime import datetime