Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1488554) for build bustage at configure\test_toolchain_configure.py on a CLOSED TREE

Browse Source 
Backed out changeset a21462dc142a (bug 1488554)
Backed out changeset 6a34f5779281 (bug 1488554)
Backed out changeset 0d03acc584bc (bug 1488554)
This commit is contained in:
Gurzau Raul 2018-09-05 04:10:31 +03:00
parent 55896c33ae
commit a2063df372
3 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/talos/talos/run_tests.py
View File

@ -14,7 +14,6 @@ import traceback
import urllib
import mozhttpd
import mozinfo
import mozversion
import utils
from mozlog import get_proxy_logger
@ -123,10 +122,7 @@ def run_tests(config, browser_config):
if not test.get('profile', False):
test['profile'] = config.get('profile')
if mozinfo.os == 'win':
browser_config['extra_args'] = ['--no-deelevate', '--wait-for-browser']
else:
browser_config['extra_args'] = []
browser_config['extra_args'] = []
# pass --no-remote to firefox launch, if --develop is specified
# we do that to allow locally the user to have another running firefox

31
testing/talos/talos/xtalos/etlparser.py
View File

@ -18,7 +18,6 @@ import xtalos
EVENTNAME_INDEX = 0
PROCESS_INDEX = 2
THREAD_ID_INDEX = 3
PARENT_PID_INDEX = 3
DISKBYTES_COL = "Size"
FNAME_COL = "FileName"
IMAGEFUNC_COL = "Image!Function"
@ -51,7 +50,6 @@ net_events = {
gThreads = {}
gConnectionIDs = {}
gHeaders = {}
gBrowserPID = None
def uploadFile(filename):
@ -201,31 +199,12 @@ def etl2csv(xperf_path, etl_filename, debug=False):
return csv_filename
def trackProcess(row, firstFirefoxPID):
global gBrowserPID
if gBrowserPID:
return
# Without the launcher, the initial Firefox process *is* the browser
# process. OTOH, with the launcher process enabled, the browser is actually
# the first child process of the first Firefox process.
parentPID = int(row[PARENT_PID_INDEX])
if parentPID == firstFirefoxPID:
proc = row[PROCESS_INDEX]
gBrowserPID = int(re.search("^.* \(\s*(\d+)\)$", proc).group(1))
def getBrowserPID():
global gBrowserPID
return gBrowserPID
def trackThread(row, browserPID):
def trackThread(row, firefoxPID):
event, proc, tid = \
row[EVENTNAME_INDEX], row[PROCESS_INDEX], row[THREAD_ID_INDEX]
if event in ["T-DCStart", "T-Start"]:
procName, procID = re.search("^(.*) \(\s*(\d+)\)$", proc).group(1, 2)
if procID == str(browserPID):
if procID == str(firefoxPID):
imgIdx = getIndex(event, IMAGEFUNC_COL)
img = re.match("([^!]+)!", row[imgIdx]).group(1)
if img == procName:
@ -340,10 +319,8 @@ def etlparser(xperf_path, etl_filename, processID, approot=None,
csvname = etl2csv(xperf_path, etl_filename, debug=debug)
for row in readFile(csvname):
event = row[EVENTNAME_INDEX]
if event == "P-Start":
trackProcess(row, processID)
elif event in ["T-DCStart", "T-Start", "T-DCEnd", "T-End"]:
trackThread(row, getBrowserPID())
if event in ["T-DCStart", "T-Start", "T-DCEnd", "T-End"]:
trackThread(row, processID)
elif event in ["FileIoRead", "FileIoWrite"] and \
row[THREAD_ID_INDEX] in gThreads:
fileSummary(row, stage, files)

7
toolkit/moz.configure
View File

@ -1055,12 +1055,7 @@ set_config('MOZ_UNSIGNED_SYSTEM_SCOPE', unsigned_addon_scopes.system)
# Launcher process (Windows only)
# ==============================================================
@depends(target, milestone)
def launcher_process_default(target, milestone):
return target.os == 'WINNT' and milestone.is_nightly
option('--enable-launcher-process', default=launcher_process_default,
help='Enable launcher process by default')
option('--enable-launcher-process', help='Enable launcher process by default')
@depends('--enable-launcher-process', target)
def launcher(value, target):