зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1889658 - Remove Windows XP/7 references from some test scripts. r=gbrown,perftest-reviewers,taskgraph-reviewers,sparky
Differential Revision: https://phabricator.services.mozilla.com/D206651
This commit is contained in:
Joel Maher
Родитель
ca0e96c55b
Коммит
20bdf0b688
|
|
@ -482,22 +482,6 @@ class RefTest(object):
|
|||
if options.thisChunk:
|
||||
prefs["reftest.thisChunk"] = options.thisChunk
|
||||
|
||||
# Bug 1262954: For winXP + e10s disable acceleration
|
||||
if (
|
||||
platform.system() in ("Windows", "Microsoft")
|
||||
and "5.1" in platform.version()
|
||||
and options.e10s
|
||||
):
|
||||
prefs["layers.acceleration.disabled"] = True
|
||||
|
||||
# Bug 1300355: Disable canvas cache for win7 as it uses
|
||||
# too much memory and causes OOMs.
|
||||
if (
|
||||
platform.system() in ("Windows", "Microsoft")
|
||||
and "6.1" in platform.version()
|
||||
):
|
||||
prefs["reftest.nocache"] = True
|
||||
|
||||
if options.marionette:
|
||||
# options.marionette can specify host:port
|
||||
port = options.marionette.split(":")[1]
|
||||
|
|
|
|||
|
|
@ -101,8 +101,8 @@ def guess_mozinfo_from_task(task, repo=""):
|
|||
("linux", "1804"): "18.04",
|
||||
("macosx", "1015"): "10.15",
|
||||
("macosx", "1100"): "11.00",
|
||||
("windows", "7"): "6.1",
|
||||
("windows", "10"): "10.0",
|
||||
("windows", "11"): "11.0",
|
||||
}
|
||||
for (name, old_ver), new_ver in os_versions.items():
|
||||
if p_os["name"] == name and p_os["version"] == old_ver:
|
||||
|
|
|
|||
|
|
@ -377,10 +377,6 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
|
|||
"--suppress-handler-traceback",
|
||||
]
|
||||
|
||||
is_windows_7 = (
|
||||
mozinfo.info["os"] == "win" and mozinfo.info["os_version"] == "6.1"
|
||||
)
|
||||
|
||||
if self.repeat > 0:
|
||||
# repeat should repeat the original test, so +1 for first run
|
||||
cmd.append("--repeat=%s" % (self.repeat + 1))
|
||||
|
|
@ -390,9 +386,9 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
|
|||
or mozinfo.info["tsan"]
|
||||
or "wdspec" in test_types
|
||||
or not c["disable_fission"]
|
||||
# Bug 1392106 - skia error 0x80070005: Access is denied.
|
||||
or is_windows_7
|
||||
and mozinfo.info["debug"]
|
||||
# reftest on osx needs to be 1 process
|
||||
or "reftest" in test_types
|
||||
and sys.platform.startswith("darwin")
|
||||
):
|
||||
processes = 1
|
||||
else:
|
||||
|
|
@ -408,11 +404,7 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
|
|||
else:
|
||||
cmd += ["--binary=%s" % self.binary_path, "--product=firefox"]
|
||||
|
||||
if is_windows_7:
|
||||
# On Windows 7 --install-fonts fails, so fall back to a Firefox-specific codepath
|
||||
self._install_fonts()
|
||||
else:
|
||||
cmd += ["--install-fonts"]
|
||||
cmd += ["--install-fonts"]
|
||||
|
||||
for test_type in test_types:
|
||||
cmd.append("--test-type=%s" % test_type)
|
||||
|
|
|
|||
|
|
@ -1243,7 +1243,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -1999,7 +1998,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -2327,7 +2325,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -2885,7 +2882,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 25
|
||||
* unit: frame interval
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -3206,7 +3202,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -4175,7 +4170,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -4497,7 +4491,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -4819,7 +4812,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -5141,7 +5133,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -5463,7 +5454,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -5785,7 +5775,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -6107,7 +6096,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -6429,7 +6417,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -6751,7 +6738,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -7073,7 +7059,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -7395,7 +7380,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -7717,7 +7701,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 5
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -8646,7 +8629,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 10
|
||||
* unit: score
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -8858,7 +8840,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 10
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -10730,7 +10711,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tpmozafterpaint: False
|
||||
* tppagecycles: 25
|
||||
* unit: ms
|
||||
* w7_counters: None
|
||||
* win_counters: None
|
||||
* Command
|
||||
|
||||
|
|
@ -10945,7 +10925,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tppagecycles: 1
|
||||
* tptimeout: 10000
|
||||
* unit: ms
|
||||
* w7_counters: []
|
||||
* win_counters: []
|
||||
* xperf_counters: ['main_startup_fileio', 'main_startup_netio', 'main_normal_fileio', 'main_normal_netio', 'nonmain_startup_fileio', 'nonmain_normal_fileio', 'nonmain_normal_netio', 'mainthread_readcount', 'mainthread_readbytes', 'mainthread_writecount', 'mainthread_writebytes', 'time_to_session_store_window_restored_ms']
|
||||
* xperf_providers: ['PROC_THREAD', 'LOADER', 'HARD_FAULTS', 'FILENAME', 'FILE_IO', 'FILE_IO_INIT']
|
||||
|
|
@ -11108,7 +11087,6 @@ For the sample commands found below, note that the capitalization used is import
|
|||
* tppagecycles: 25
|
||||
* tptimeout: 5000
|
||||
* unit: ms
|
||||
* w7_counters: ['% Processor Time']
|
||||
* win_counters: ['% Processor Time']
|
||||
* Command
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ DEFAULTS = dict(
|
|||
tploadnocache=False,
|
||||
tpscrolltest=False,
|
||||
win_counters=[],
|
||||
w7_counters=[],
|
||||
linux_counters=[],
|
||||
mac_counters=[],
|
||||
xperf_counters=[],
|
||||
|
|
@ -118,7 +117,6 @@ def fix_xperf(config):
|
|||
# BBB: remove doubly-quoted xperf values from command line
|
||||
# (needed for buildbot)
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=704654#c43
|
||||
win7_path = "c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe"
|
||||
if config["xperf_path"]:
|
||||
xperf_path = config["xperf_path"]
|
||||
quotes = ('"', "'")
|
||||
|
|
@ -126,13 +124,6 @@ def fix_xperf(config):
|
|||
if xperf_path.startswith(quote) and xperf_path.endswith(quote):
|
||||
config["xperf_path"] = xperf_path[1:-1]
|
||||
break
|
||||
if not os.path.exists(config["xperf_path"]):
|
||||
# look for old win7 path
|
||||
if not os.path.exists(win7_path):
|
||||
raise ConfigurationError(
|
||||
"xperf.exe cannot be found at the path specified"
|
||||
)
|
||||
config["xperf_path"] = win7_path
|
||||
|
||||
|
||||
@validator
|
||||
|
|
@ -182,11 +173,6 @@ def determine_local_symbols_path(config):
|
|||
)
|
||||
|
||||
|
||||
def get_counters(config):
|
||||
counters = set()
|
||||
return counters
|
||||
|
||||
|
||||
def get_active_tests(config):
|
||||
activeTests = config.pop("activeTests").strip().split(":")
|
||||
|
||||
|
|
@ -281,7 +267,6 @@ def get_test(config, global_overrides, counters, test_instance):
|
|||
"linux_counters",
|
||||
"mac_counters",
|
||||
"win_counters",
|
||||
"w7_counters",
|
||||
"xperf_counters",
|
||||
)
|
||||
for key in keys:
|
||||
|
|
@ -300,7 +285,7 @@ def get_test(config, global_overrides, counters, test_instance):
|
|||
|
||||
@validator
|
||||
def tests(config):
|
||||
counters = get_counters(config)
|
||||
counters = set()
|
||||
global_overrides = get_global_overrides(config)
|
||||
activeTests = get_active_tests(config)
|
||||
test_dict = test.test_dict()
|
||||
|
|
|
|||
|
|
@ -345,7 +345,6 @@ class PageloaderTest(Test):
|
|||
"gecko_profile_extra_threads",
|
||||
"tptimeout",
|
||||
"win_counters",
|
||||
"w7_counters",
|
||||
"linux_counters",
|
||||
"mac_counters",
|
||||
"tpscrolltest",
|
||||
|
|
@ -542,7 +541,7 @@ class tart(PageloaderTest):
|
|||
tploadnocache = True
|
||||
tpmozafterpaint = False
|
||||
gecko_profile_interval = 10
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
"""
|
||||
ASAP mode
|
||||
The recording API is broken with OMTC before ~2013-11-27
|
||||
|
|
@ -577,7 +576,7 @@ class damp(PageloaderTest):
|
|||
tpmozafterpaint = False
|
||||
gecko_profile_interval = 10
|
||||
gecko_profile_extra_threads = "DOM Worker"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
filters = filter.ignore_first.prepare(1) + filter.median.prepare()
|
||||
preferences = {"devtools.memory.enabled": True}
|
||||
unit = "ms"
|
||||
|
|
@ -604,7 +603,7 @@ class glterrain(PageloaderTest):
|
|||
tpchrome = False
|
||||
timeout = 600
|
||||
gecko_profile_interval = 10
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
""" ASAP mode """
|
||||
preferences = {
|
||||
"layout.frame_rate": 0,
|
||||
|
|
@ -632,7 +631,7 @@ class glvideo(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "CanvasRenderer,CanvasWorker,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
filters = filter.ignore_first.prepare(1) + filter.median.prepare()
|
||||
unit = "ms"
|
||||
|
||||
|
|
@ -654,7 +653,7 @@ class canvas2dvideo(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "CanvasRenderer,CanvasWorker,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
filters = filter.ignore_first.prepare(1) + filter.median.prepare()
|
||||
unit = "ms"
|
||||
|
||||
|
|
@ -676,7 +675,7 @@ class offscreencanvas_webcodecs_main_webgl_h264(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "CanvasRenderer,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -702,7 +701,7 @@ class offscreencanvas_webcodecs_main_webgl_vp9(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "CanvasRenderer,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -728,7 +727,7 @@ class offscreencanvas_webcodecs_main_webgl_av1(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "CanvasRenderer,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -754,7 +753,7 @@ class offscreencanvas_webcodecs_worker_webgl_h264(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "DOM Worker,CanvasRenderer,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -780,7 +779,7 @@ class offscreencanvas_webcodecs_worker_webgl_vp9(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "DOM Worker,CanvasRenderer,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -806,7 +805,7 @@ class offscreencanvas_webcodecs_worker_webgl_av1(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "DOM Worker,CanvasRenderer,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -834,7 +833,7 @@ class offscreencanvas_webcodecs_main_2d_h264(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "CanvasRenderer,CanvasWorker,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -862,7 +861,7 @@ class offscreencanvas_webcodecs_main_2d_vp9(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "CanvasRenderer,CanvasWorker,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -890,7 +889,7 @@ class offscreencanvas_webcodecs_main_2d_av1(PageloaderTest):
|
|||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
gecko_profile_extra_threads = "CanvasRenderer,CanvasWorker,MediaSupervisor"
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -918,7 +917,7 @@ class offscreencanvas_webcodecs_worker_2d_h264(PageloaderTest):
|
|||
gecko_profile_extra_threads = (
|
||||
"DOM Worker,CanvasRenderer,CanvasWorker,MediaSupervisor"
|
||||
)
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -946,7 +945,7 @@ class offscreencanvas_webcodecs_worker_2d_vp9(PageloaderTest):
|
|||
gecko_profile_extra_threads = (
|
||||
"DOM Worker,CanvasRenderer,CanvasWorker,MediaSupervisor"
|
||||
)
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -974,7 +973,7 @@ class offscreencanvas_webcodecs_worker_2d_av1(PageloaderTest):
|
|||
gecko_profile_extra_threads = (
|
||||
"DOM Worker,CanvasRenderer,CanvasWorker,MediaSupervisor"
|
||||
)
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
preferences = {
|
||||
"dom.media.webcodecs.enabled": True,
|
||||
"dom.media.webcodecs.force-osx-h264-enabled": True,
|
||||
|
|
@ -1003,7 +1002,6 @@ class tp5n(PageloaderTest):
|
|||
tpmozafterpaint = True
|
||||
tptimeout = 10000
|
||||
mainthread = True
|
||||
w7_counters = []
|
||||
win_counters = []
|
||||
linux_counters = []
|
||||
mac_counters = []
|
||||
|
|
@ -1057,7 +1055,6 @@ class tp5o(PageloaderTest):
|
|||
multidomain = True
|
||||
tpmanifest = "${talos}/fis/tp5n/tp5o.manifest"
|
||||
win_counters = ["% Processor Time"]
|
||||
w7_counters = ["% Processor Time"]
|
||||
linux_counters = ["XRes"]
|
||||
mac_counters = []
|
||||
responsiveness = True
|
||||
|
|
@ -1456,7 +1453,7 @@ class displaylist_mutate(PageloaderTest):
|
|||
tpchrome = False
|
||||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
filters = filter.ignore_first.prepare(1) + filter.median.prepare()
|
||||
"""ASAP mode"""
|
||||
preferences = {
|
||||
|
|
@ -1482,7 +1479,7 @@ class rasterflood_svg(PageloaderTest):
|
|||
tpchrome = False
|
||||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
filters = filter.ignore_first.prepare(1) + filter.median.prepare()
|
||||
"""ASAP mode"""
|
||||
preferences = {
|
||||
|
|
@ -1507,7 +1504,7 @@ class rasterflood_gradient(PageloaderTest):
|
|||
tpchrome = False
|
||||
timeout = 600
|
||||
gecko_profile_interval = 2
|
||||
win_counters = w7_counters = linux_counters = mac_counters = None
|
||||
win_counters = linux_counters = mac_counters = None
|
||||
filters = filter.ignore_first.prepare(1) + filter.median.prepare()
|
||||
"""ASAP mode"""
|
||||
preferences = {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ from talos import results, talosconfig, utils
|
|||
from talos.cmanager import CounterManagement
|
||||
from talos.ffsetup import FFSetup
|
||||
from talos.talos_process import run_browser
|
||||
from talos.utils import TalosCrash, TalosError, TalosRegression, run_in_debug_mode
|
||||
from talos.utils import TalosCrash, TalosRegression, run_in_debug_mode
|
||||
|
||||
LOG = get_proxy_logger()
|
||||
|
||||
|
|
@ -67,18 +67,7 @@ class TTest(object):
|
|||
if platform.system() == "Linux":
|
||||
return "linux"
|
||||
elif platform.system() in ("Windows", "Microsoft"):
|
||||
if "6.1" in platform.version(): # w7
|
||||
return "w7"
|
||||
elif "6.2" in platform.version(): # w8
|
||||
return "w8"
|
||||
# Bug 1264325 - FIXME: with python 2.7.11: reports win8 instead of 8.1
|
||||
elif "6.3" in platform.version():
|
||||
return "w8"
|
||||
# Bug 1264325 - FIXME: with python 2.7.11: reports win8 instead of 10
|
||||
elif "10.0" in platform.version():
|
||||
return "w8"
|
||||
else:
|
||||
raise TalosError("unsupported windows version")
|
||||
return "win"
|
||||
elif platform.system() == "Darwin":
|
||||
return "mac"
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ class mock_test(PageloaderTest):
|
|||
"gecko_profile_entries",
|
||||
"tptimeout",
|
||||
"win_counters",
|
||||
"w7_counters",
|
||||
"linux_counters",
|
||||
"mac_counters",
|
||||
"tpscrolltest",
|
||||
|
|
@ -143,7 +142,6 @@ class Test_get_test(object):
|
|||
linux_counters=None,
|
||||
mac_counters=[],
|
||||
win_counters=["counter_a"],
|
||||
w7_counters=["counter_a", "counter_b"],
|
||||
xperf_counters=["counter_a", "counter_extra"],
|
||||
)
|
||||
|
||||
|
|
@ -155,7 +153,6 @@ class Test_get_test(object):
|
|||
assert test_dict["linux_counters"] == counters
|
||||
assert test_dict["mac_counters"] == counters
|
||||
assert test_dict["win_counters"] == counters
|
||||
assert test_dict["w7_counters"] == counters
|
||||
assert set(test_dict["xperf_counters"]) == set(counters + ["counter_extra"])
|
||||
|
||||
|
||||
|
|
@ -553,7 +550,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 10
|
||||
assert test_config["gecko_profile_entries"] == 1000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["preferences"] == {
|
||||
|
|
@ -578,7 +574,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 10
|
||||
assert test_config["gecko_profile_entries"] == 1000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -599,7 +594,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 10
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["preferences"] == {
|
||||
|
|
@ -624,7 +618,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -647,7 +640,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -670,7 +662,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -693,7 +684,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -716,7 +706,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -739,7 +728,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -762,7 +750,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -785,7 +772,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -808,7 +794,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -831,7 +816,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -854,7 +838,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -877,7 +860,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -900,7 +882,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -923,7 +904,6 @@ class Test_get_config(object):
|
|||
assert test_config["gecko_profile_interval"] == 2
|
||||
assert test_config["gecko_profile_entries"] == 2000000
|
||||
assert "win_counters" not in test_config
|
||||
assert "w7_counters" not in test_config
|
||||
assert "linux_counters" not in test_config
|
||||
assert "mac_counters" not in test_config
|
||||
assert test_config["filters"] is not None
|
||||
|
|
@ -943,7 +923,6 @@ class Test_get_config(object):
|
|||
assert test_config["tpmozafterpaint"] is True
|
||||
assert test_config["tptimeout"] == 5000
|
||||
assert test_config["mainthread"] is True
|
||||
assert test_config["w7_counters"] == []
|
||||
assert test_config["win_counters"] == []
|
||||
assert test_config["linux_counters"] == []
|
||||
assert test_config["mac_counters"] == []
|
||||
|
|
@ -1001,7 +980,6 @@ class Test_get_config(object):
|
|||
assert test_config["mainthread"] is False
|
||||
assert test_config["tpmanifest"] != "${talos}/tests/tp5n/tp5o.manifest"
|
||||
assert test_config["win_counters"] == ["% Processor Time"]
|
||||
assert test_config["w7_counters"] == ["% Processor Time"]
|
||||
assert test_config["linux_counters"] == ["XRes"]
|
||||
assert test_config["mac_counters"] == []
|
||||
assert test_config["responsiveness"] is True
|
||||
|
|
@ -1025,7 +1003,6 @@ class Test_get_config(object):
|
|||
assert test_config["mainthread"] is False
|
||||
assert test_config["tpmanifest"] != "${talos}/tests/tp5n/tp5o.manifest"
|
||||
assert test_config["win_counters"] == ["% Processor Time"]
|
||||
assert test_config["w7_counters"] == ["% Processor Time"]
|
||||
assert test_config["linux_counters"] == ["XRes"]
|
||||
assert test_config["mac_counters"] == []
|
||||
assert test_config["responsiveness"] is True
|
||||
|
|
|
|||
|
|
@ -111,7 +111,6 @@ class WebPlatformTestsRunnerSetup(MozbuildObject):
|
|||
|
||||
def kwargs_firefox(self, kwargs):
|
||||
"""Setup kwargs specific to running Firefox and other gecko browsers"""
|
||||
import mozinfo
|
||||
from wptrunner import wptcommandline
|
||||
|
||||
kwargs = self.kwargs_common(kwargs)
|
||||
|
|
@ -144,15 +143,6 @@ class WebPlatformTestsRunnerSetup(MozbuildObject):
|
|||
if kwargs["install_fonts"] is None:
|
||||
kwargs["install_fonts"] = True
|
||||
|
||||
if (
|
||||
kwargs["install_fonts"]
|
||||
and mozinfo.info["os"] == "win"
|
||||
and mozinfo.info["os_version"] == "6.1"
|
||||
):
|
||||
# On Windows 7 --install-fonts fails, so fall back to a Firefox-specific codepath
|
||||
self.setup_fonts_firefox()
|
||||
kwargs["install_fonts"] = False
|
||||
|
||||
if kwargs["preload_browser"] is None:
|
||||
kwargs["preload_browser"] = False
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[first-available-font-001.html]
|
||||
expected:
|
||||
if os == "win" and os_version == "6.1": ["PASS", "FAIL"] # Bug 1637011
|
||||
Загрузка…
Ссылка в новой задаче