Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1539437 - Replace Chrome with Chromium mentionings where needed r=sparky,davehunt

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D25094

--HG--
rename : taskcluster/ci/test/raptor-chrome.yml => taskcluster/ci/test/raptor-chromium.yml
extra : moz-landing-system : lando
This commit is contained in:
Ionut Goldan 2019-04-12 10:33:24 +00:00
parent 7f60810d86
commit e0060de75c
51 changed files with 536 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
taskcluster/ci/config.yml
View File

@ -34,8 +34,12 @@ treeherder:
'Rap-refbrow-e10s': 'Raptor performance tests on the reference browser'
'Rap-Prof': 'Raptor performance tests on Firefox with Gecko Profiling'
'Rap-Prof-e10s': 'Raptor performance tests on Firefox with Gecko Profiling'
'Rap-C': 'Raptor performance tests on Google Chrome'
'Rap-C-e10s': 'Raptor performance tests on Google Chrome with e10s'
'Rap-ChC': 'Raptor performance tests on Google Chrome Canary'
'Rap-ChC-e10s': 'Raptor performance tests on Google Chrome Canary with e10s'
'Rap-ChD': 'Raptor performance tests on Google Chrome Dev'
'Rap-ChD-e10s': 'Raptor performance tests on Google Chrome Dev with e10s'
'Rap-Cr': 'Raptor performance tests on Google Chromium'
'Rap-Cr-e10s': 'Raptor performance tests on Google Chromium with e10s'
'Rap-P': 'Raptor power tests on Firefox'
'Rap-P-e10s': 'Raptor power tests on Firefox with e10s'
'T': 'Talos performance tests'

8
taskcluster/ci/fetch/chromium-fetch.yml
View File

@ -7,22 +7,22 @@ linux64-chromium:
description: 'Linux64 Chromium Fetch'
fetch:
platform: linux
artifact-name: chrome-linux.tar.bz2
artifact-name: chromium-linux.tar.bz2
win32-chromium:
description: 'Windows32 Chromium Fetch'
fetch:
platform: win32
artifact-name: chrome-win32.tar.bz2
artifact-name: chromium-win32.tar.bz2
win64-chromium:
description: 'Windows64 Chromium Fetch'
fetch:
platform: win64
artifact-name: chrome-win64.tar.bz2
artifact-name: chromium-win64.tar.bz2
mac-chromium:
description: 'MacOSX Chromium Fetch'
fetch:
platform: mac
artifact-name: chrome-mac.tar.bz2
artifact-name: chromium-mac.tar.bz2

2
taskcluster/ci/test/kind.yml
View File

@ -29,7 +29,7 @@ jobs-from:
- misc.yml
- mochitest.yml
- raptor.yml
- raptor-chrome.yml
- raptor-chromium.yml
- reftest.yml
- talos.yml
- web-platform.yml

210
taskcluster/ci/test/raptor-chrome.yml → taskcluster/ci/test/raptor-chromium.yml
View File

@ -43,171 +43,171 @@ job-defaults:
default:
- linux64-chromium
raptor-tp6-1-chrome:
description: "Raptor tp6-1 on Chrome"
try-name: raptor-tp6-1-chrome
treeherder-symbol: Rap-C(tp6-1)
raptor-tp6-1-chromium:
description: "Raptor tp6-1 on Chromium"
try-name: raptor-tp6-1-chromium
treeherder-symbol: Rap-Cr(tp6-1)
max-run-time: 1200
mozharness:
extra-options:
- --test=raptor-tp6-1
- --app=chrome
- --app=chromium
raptor-tp6-2-chrome:
description: "Raptor tp6-2 on Chrome"
try-name: raptor-tp6-2-chrome
treeherder-symbol: Rap-C(tp6-2)
raptor-tp6-2-chromium:
description: "Raptor tp6-2 on Chromium"
try-name: raptor-tp6-2-chromium
treeherder-symbol: Rap-Cr(tp6-2)
mozharness:
extra-options:
- --test=raptor-tp6-2
- --app=chrome
- --app=chromium
raptor-tp6-3-chrome:
description: "Raptor tp6-3 on Chrome"
try-name: raptor-tp6-3-chrome
treeherder-symbol: Rap-C(tp6-3)
raptor-tp6-3-chromium:
description: "Raptor tp6-3 on Chromium"
try-name: raptor-tp6-3-chromium
treeherder-symbol: Rap-Cr(tp6-3)
max-run-time: 2400
mozharness:
extra-options:
- --test=raptor-tp6-3
- --app=chrome
- --app=chromium
raptor-tp6-4-chrome:
description: "Raptor tp6-4 on Chrome"
try-name: raptor-tp6-4-chrome
treeherder-symbol: Rap-C(tp6-4)
raptor-tp6-4-chromium:
description: "Raptor tp6-4 on Chromium"
try-name: raptor-tp6-4-chromium
treeherder-symbol: Rap-Cr(tp6-4)
mozharness:
extra-options:
- --test=raptor-tp6-4
- --app=chrome
- --app=chromium
raptor-tp6-5-chrome:
description: "Raptor tp6-5 on Chrome"
try-name: raptor-tp6-5-chrome
treeherder-symbol: Rap-C(tp6-5)
raptor-tp6-5-chromium:
description: "Raptor tp6-5 on Chromium"
try-name: raptor-tp6-5-chromium
treeherder-symbol: Rap-Cr(tp6-5)
mozharness:
extra-options:
- --test=raptor-tp6-5
- --app=chrome
- --app=chromium
raptor-tp6-6-chrome:
description: "Raptor tp6-6 on Chrome"
try-name: raptor-tp6-6-chrome
treeherder-symbol: Rap-C(tp6-6)
raptor-tp6-6-chromium:
description: "Raptor tp6-6 on Chromium"
try-name: raptor-tp6-6-chromium
treeherder-symbol: Rap-Cr(tp6-6)
mozharness:
extra-options:
- --test=raptor-tp6-6
- --app=chrome
- --app=chromium
raptor-tp6-7-chrome:
description: "Raptor tp6-7 on Chrome"
try-name: raptor-tp6-7-chrome
treeherder-symbol: Rap-C(tp6-7)
raptor-tp6-7-chromium:
description: "Raptor tp6-7 on Chromium"
try-name: raptor-tp6-7-chromium
treeherder-symbol: Rap-Cr(tp6-7)
mozharness:
extra-options:
- --test=raptor-tp6-7
- --app=chrome
- --app=chromium
raptor-tp6-8-chrome:
description: "Raptor tp6-8 on Chrome"
try-name: raptor-tp6-8-chrome
treeherder-symbol: Rap-C(tp6-8)
raptor-tp6-8-chromium:
description: "Raptor tp6-8 on Chromium"
try-name: raptor-tp6-8-chromium
treeherder-symbol: Rap-Cr(tp6-8)
mozharness:
extra-options:
- --test=raptor-tp6-8
- --app=chrome
- --app=chromium
raptor-tp6-8-404-chrome:
description: "Raptor tp6-8-404 on Chrome"
try-name: raptor-tp6-8-404-chrome
treeherder-symbol: Rap-C(tp6-8-404)
raptor-tp6-8-404-chromium:
description: "Raptor tp6-8-404 on Chromium"
try-name: raptor-tp6-8-404-chromium
treeherder-symbol: Rap-Cr(tp6-8-404)
tier: 3
mozharness:
extra-options:
- --test=raptor-tp6-8-404
- --app=chrome
- --app=chromium
raptor-tp6-9-chrome:
description: "Raptor tp6-9 on Chrome"
try-name: raptor-tp6-9-chrome
treeherder-symbol: Rap-C(tp6-9)
raptor-tp6-9-chromium:
description: "Raptor tp6-9 on Chromium"
try-name: raptor-tp6-9-chromium
treeherder-symbol: Rap-Cr(tp6-9)
mozharness:
extra-options:
- --test=raptor-tp6-9
- --app=chrome
- --app=chromium
raptor-tp6-10-chrome:
description: "Raptor tp6-10 on Chrome"
try-name: raptor-tp6-10-chrome
treeherder-symbol: Rap-C(tp6-10)
raptor-tp6-10-chromium:
description: "Raptor tp6-10 on Chromium"
try-name: raptor-tp6-10-chromium
treeherder-symbol: Rap-Cr(tp6-10)
mozharness:
extra-options:
- --test=raptor-tp6-10
- --app=chrome
- --app=chromium
raptor-speedometer-chrome:
description: "Raptor Speedometer on Chrome"
try-name: raptor-speedometer-chrome
treeherder-symbol: Rap-C(sp)
raptor-speedometer-chromium:
description: "Raptor Speedometer on Chromium"
try-name: raptor-speedometer-chromium
treeherder-symbol: Rap-Cr(sp)
max-run-time: 1500
mozharness:
extra-options:
- --test=raptor-speedometer
- --app=chrome
- --app=chromium
raptor-stylebench-chrome:
description: "Raptor StyleBench on Chrome"
try-name: raptor-stylebench-chrome
treeherder-symbol: Rap-C(sb)
raptor-stylebench-chromium:
description: "Raptor StyleBench on Chromium"
try-name: raptor-stylebench-chromium
treeherder-symbol: Rap-Cr(sb)
mozharness:
extra-options:
- --test=raptor-stylebench
- --app=chrome
- --app=chromium
raptor-motionmark-htmlsuite-chrome:
description: "Raptor MotionMark HtmlSuite on Chrome"
try-name: raptor-motionmark-htmlsuite-chrome
treeherder-symbol: Rap-C(mm-h)
raptor-motionmark-htmlsuite-chromium:
description: "Raptor MotionMark HtmlSuite on Chromium"
try-name: raptor-motionmark-htmlsuite-chromium
treeherder-symbol: Rap-Cr(mm-h)
mozharness:
extra-options:
- --test=raptor-motionmark-htmlsuite
- --app=chrome
- --app=chromium
raptor-motionmark-animometer-chrome:
description: "Raptor MotionMark Animometer on Chrome"
try-name: raptor-motionmark-animometer-chrome
treeherder-symbol: Rap-C(mm-a)
raptor-motionmark-animometer-chromium:
description: "Raptor MotionMark Animometer on Chromium"
try-name: raptor-motionmark-animometer-chromium
treeherder-symbol: Rap-Cr(mm-a)
mozharness:
extra-options:
- --test=raptor-motionmark-animometer
- --app=chrome
- --app=chromium
raptor-webaudio-chrome:
description: "Raptor WebAudio on Chrome"
try-name: raptor-webaudio-chrome
treeherder-symbol: Rap-C(wa)
raptor-webaudio-chromium:
description: "Raptor WebAudio on Chromium"
try-name: raptor-webaudio-chromium
treeherder-symbol: Rap-Cr(wa)
mozharness:
extra-options:
- --test=raptor-webaudio
- --app=chrome
- --app=chromium
raptor-sunspider-chrome:
description: "Raptor SunSpider on Chrome"
try-name: raptor-sunspider-chrome
treeherder-symbol: Rap-C(ss)
raptor-sunspider-chromium:
description: "Raptor SunSpider on Chromium"
try-name: raptor-sunspider-chromium
treeherder-symbol: Rap-Cr(ss)
mozharness:
extra-options:
- --test=raptor-sunspider
- --app=chrome
- --app=chromium
raptor-unity-webgl-chrome:
description: "Raptor Unity WebGL on Chrome"
try-name: raptor-unity-webgl-chrome
treeherder-symbol: Rap-C(ugl)
raptor-unity-webgl-chromium:
description: "Raptor Unity WebGL on Chromium"
try-name: raptor-unity-webgl-chromium
treeherder-symbol: Rap-Cr(ugl)
mozharness:
extra-options:
- --test=raptor-unity-webgl
- --app=chrome
- --app=chromium
fetches:
fetch:
by-test-platform:
@ -224,14 +224,14 @@ raptor-unity-webgl-chrome:
- linux64-chromium
- unity-webgl
raptor-wasm-misc-chrome:
description: "Raptor WASM Misc on Chrome"
try-name: raptor-wasm-misc-chrome
treeherder-symbol: Rap-C(wm)
raptor-wasm-misc-chromium:
description: "Raptor WASM Misc on Chromium"
try-name: raptor-wasm-misc-chromium
treeherder-symbol: Rap-Cr(wm)
mozharness:
extra-options:
- --test=raptor-wasm-misc
- --app=chrome
- --app=chromium
fetches:
fetch:
by-test-platform:
@ -248,15 +248,15 @@ raptor-wasm-misc-chrome:
- linux64-chromium
- wasm-misc
raptor-assorted-dom-chrome:
description: "Raptor Assorted-Dom on Chrome"
try-name: raptor-assorted-dom-chrome
treeherder-symbol: Rap-C(dom)
raptor-assorted-dom-chromium:
description: "Raptor Assorted-Dom on Chromium"
try-name: raptor-assorted-dom-chromium
treeherder-symbol: Rap-Cr(dom)
max-run-time: 1500
mozharness:
extra-options:
- --test=raptor-assorted-dom
- --app=chrome
- --app=chromium
fetches:
fetch:
by-test-platform:
@ -273,12 +273,12 @@ raptor-assorted-dom-chrome:
- linux64-chromium
- assorted-dom
raptor-wasm-godot-chrome:
description: "Raptor Wasm Godot on Chrome"
try-name: raptor-wasm-godot-chrome
treeherder-symbol: Rap-C(godot)
raptor-wasm-godot-chromium:
description: "Raptor Wasm Godot on Chromium"
try-name: raptor-wasm-godot-chromium
treeherder-symbol: Rap-Cr(godot)
max-run-time: 1500
mozharness:
extra-options:
- --test=raptor-wasm-godot
- --app=chrome
- --app=chromium

10
taskcluster/ci/test/test-platforms.yml
View File

@ -62,8 +62,8 @@ linux64-shippable/opt:
- awsy
- mochitest-headless
- linux-talos-flex
- raptor-chrome
- raptor-fetch-chrome
- raptor-chromium
- raptor-fetch-chromium
- raptor-firefox
- raptor-fetch-firefox
- raptor-profiling
@ -158,7 +158,7 @@ windows7-32-shippable/opt:
- windows-talos
- windows-tests
- web-platform-tests
- raptor-chrome
- raptor-chromium
- raptor-firefox
windows7-32-devedition/opt:
@ -230,7 +230,7 @@ windows10-64-shippable/opt:
- web-platform-tests
- mochitest-headless
- raptor-firefox
- raptor-chrome
- raptor-chromium
- raptor-profiling
windows10-64-devedition/opt:
@ -287,7 +287,7 @@ macosx64-shippable/opt:
- macosx64-tests
- desktop-screenshot-capture
- awsy
- raptor-chrome
- raptor-chromium
- raptor-firefox
- raptor-profiling
- marionette-media-tests

46
taskcluster/ci/test/test-sets.yml
View File

@ -119,25 +119,25 @@ raptor-profiling:
- raptor-sunspider-firefox-profiling
- raptor-wasm-godot-firefox-profiling
raptor-chrome:
- raptor-tp6-1-chrome
- raptor-tp6-2-chrome
- raptor-tp6-3-chrome
- raptor-tp6-4-chrome
- raptor-tp6-5-chrome
- raptor-tp6-6-chrome
- raptor-tp6-7-chrome
- raptor-tp6-8-chrome
- raptor-tp6-8-404-chrome
- raptor-tp6-9-chrome
- raptor-tp6-10-chrome
- raptor-speedometer-chrome
- raptor-stylebench-chrome
- raptor-motionmark-htmlsuite-chrome
- raptor-motionmark-animometer-chrome
- raptor-webaudio-chrome
- raptor-sunspider-chrome
- raptor-wasm-godot-chrome
raptor-chromium:
- raptor-tp6-1-chromium
- raptor-tp6-2-chromium
- raptor-tp6-3-chromium
- raptor-tp6-4-chromium
- raptor-tp6-5-chromium
- raptor-tp6-6-chromium
- raptor-tp6-7-chromium
- raptor-tp6-8-chromium
- raptor-tp6-8-404-chromium
- raptor-tp6-9-chromium
- raptor-tp6-10-chromium
- raptor-speedometer-chromium
- raptor-stylebench-chromium
- raptor-motionmark-htmlsuite-chromium
- raptor-motionmark-animometer-chromium
- raptor-webaudio-chromium
- raptor-sunspider-chromium
- raptor-wasm-godot-chromium
# Fetch tasks are only supported on Linux for now,
# so these need to be separate sets.
@ -166,10 +166,10 @@ raptor-fetch-geckoview:
- raptor-unity-webgl-geckoview
- raptor-unity-webgl-refbrow
raptor-fetch-chrome:
- raptor-unity-webgl-chrome
- raptor-wasm-misc-chrome
- raptor-assorted-dom-chrome
raptor-fetch-chromium:
- raptor-unity-webgl-chromium
- raptor-wasm-misc-chromium
- raptor-assorted-dom-chromium
awsy:
- awsy

14
taskcluster/scripts/misc/fetch-chromium.py
View File

@ -33,22 +33,22 @@ CHROMIUM_INFO = {
'linux': {
'platform': 'Linux_x64',
'archive': 'chrome-linux.zip',
'result': 'chrome-linux.tar.bz2'
'result': 'chromium-linux.tar.bz2'
},
'win32': {
'platform': 'Win_x64',
'archive': 'chrome-win.zip',
'result': 'chrome-win32.tar.bz2'
'result': 'chromium-win32.tar.bz2'
},
'win64': {
'platform': 'Win_x64',
'archive': 'chrome-win.zip',
'result': 'chrome-win64.tar.bz2'
'result': 'chromium-win64.tar.bz2'
},
'mac': {
'platform': 'Mac',
'archive': 'chrome-mac.zip',
'result': 'chrome-mac.tar.bz2'
'result': 'chromium-mac.tar.bz2'
}
}
@ -137,7 +137,7 @@ def build_chromium_archive(platform, revision=None):
# Make a temporary location for the file
tmppath = tempfile.mkdtemp()
tmpzip = os.path.join(tmppath, 'tmp-chrome.zip')
tmpzip = os.path.join(tmppath, 'tmp-chromium.zip')
revision = fetch_chromium_build(platform, revision, tmpzip)
@ -160,8 +160,8 @@ def build_chromium_archive(platform, revision=None):
"Could not find any directories after extraction of chromium zip."
)
chrome_dir = os.path.join(tmppath, dirs[0])
revision_file = os.path.join(chrome_dir, '.REVISION')
chromium_dir = os.path.join(tmppath, dirs[0])
revision_file = os.path.join(chromium_dir, '.REVISION')
with open(revision_file, 'w+') as f:
f.write(str(revision))

6
taskcluster/taskgraph/transforms/fetch.py
View File

@ -258,7 +258,11 @@ def create_chromium_fetch_task(config, job):
task,
cache_type=CACHE_TYPE,
cache_name=cache_name,
digest_data=["revision={}".format(revision), "platform={}".format(platform)],
digest_data=[
"revision={}".format(revision),
"platform={}".format(platform),
"artifact_name={}".format(artifact_name),
],
)
return task

12
testing/mozbase/mozprofile/mozprofile/profile.py
View File

@ -22,6 +22,7 @@ from .prefs import Preferences
__all__ = ['BaseProfile',
'ChromeProfile',
'ChromiumProfile',
'Profile',
'FirefoxProfile',
'ThunderbirdProfile',
@ -448,7 +449,7 @@ class ThunderbirdProfile(Profile):
}
class ChromeProfile(BaseProfile):
class ChromiumProfile(BaseProfile):
preference_file_names = ('Preferences',)
class AddonManager(list):
@ -463,7 +464,7 @@ class ChromeProfile(BaseProfile):
return False
def __init__(self, **kwargs):
super(ChromeProfile, self).__init__(**kwargs)
super(ChromiumProfile, self).__init__(**kwargs)
if self.create_new:
self.profile = os.path.join(self.profile, 'Default')
@ -495,8 +496,15 @@ class ChromeProfile(BaseProfile):
fh.write(prefstr)
class ChromeProfile(ChromiumProfile):
# update this if Google Chrome requires more
# specific profiles
pass
profile_class = {
'chrome': ChromeProfile,
'chromium': ChromiumProfile,
'firefox': FirefoxProfile,
'thunderbird': ThunderbirdProfile,
}

3
testing/mozbase/mozprofile/tests/test_profile.py
View File

@ -16,6 +16,7 @@ from mozprofile import (
BaseProfile,
Profile,
ChromeProfile,
ChromiumProfile,
FirefoxProfile,
ThunderbirdProfile,
create_profile,
@ -44,6 +45,7 @@ def test_with_profile_should_cleanup_even_on_exception():
@pytest.mark.parametrize('app,cls', [
('chrome', ChromeProfile),
('chromium', ChromiumProfile),
('firefox', FirefoxProfile),
('thunderbird', ThunderbirdProfile),
('unknown', None)
@ -65,6 +67,7 @@ def test_create_profile(tmpdir, app, cls):
@pytest.mark.parametrize('cls', [
Profile,
ChromeProfile,
ChromiumProfile,
])
def test_merge_profile(cls):
profile = cls(preferences={'foo': 'bar'})

6
testing/mozbase/mozrunner/mozrunner/application.py
View File

@ -13,6 +13,7 @@ from mozdevice import ADBDevice
from mozprofile import (
Profile,
ChromeProfile,
ChromiumProfile,
FirefoxProfile,
ThunderbirdProfile
)
@ -23,6 +24,7 @@ here = os.path.abspath(os.path.dirname(__file__))
def get_app_context(appname):
context_map = {
'chrome': ChromeContext,
'chromium': ChromiumContext,
'default': DefaultContext,
'fennec': FennecContext,
'firefox': FirefoxContext,
@ -148,3 +150,7 @@ class ThunderbirdContext(object):
class ChromeContext(object):
profile_class = ChromeProfile
class ChromiumContext(object):
profile_class = ChromiumProfile

12
testing/mozbase/mozrunner/mozrunner/runners.py
View File

@ -85,6 +85,17 @@ def ChromeRunner(*args, **kwargs):
return BlinkRuntimeRunner(*args, **kwargs)
def ChromiumRunner(*args, **kwargs):
"""
Create a desktop Google Chromium runner.
:param binary: Path to Chromium binary.
:param cmdargs: Arguments to pass into the binary.
"""
kwargs['app_ctx'] = get_app_context('chromium')()
return BlinkRuntimeRunner(*args, **kwargs)
def FennecEmulatorRunner(avd='mozemulator-4.3',
adb_path=None,
avd_home=None,
@ -125,6 +136,7 @@ def FennecEmulatorRunner(avd='mozemulator-4.3',
runners = {
'chrome': ChromeRunner,
'chromium': ChromiumRunner,
'default': Runner,
'firefox': FirefoxRunner,
'fennec': FennecEmulatorRunner,

10
testing/mozbase/mozrunner/tests/conftest.py
View File

@ -19,13 +19,15 @@ def get_binary():
os.environ['GECKO_BINARY_PATH'] = os.environ['BROWSER_PATH']
def inner(app):
if app not in ('chrome', 'firefox'):
if app not in ('chrome', 'chromium', 'firefox'):
pytest.xfail(reason="{} support not implemented".format(app))
if app == 'firefox':
binary = fixtures.binary()
elif app == 'chrome':
binary = os.environ.get('CHROME_BINARY_PATH')
elif app == 'chromium':
binary = os.environ.get('CHROMIUM_BINARY_PATH')
if not binary:
pytest.skip("could not find a {} binary".format(app))
@ -33,14 +35,14 @@ def get_binary():
return inner
@pytest.fixture(params=['firefox', 'chrome'])
@pytest.fixture(params=['firefox', 'chrome', 'chromium'])
def runner(request, get_binary):
app = request.param
binary = get_binary(app)
cmdargs = ['--headless']
if app == 'chrome':
# prevents headless chrome from exiting after loading the page
if app in ['chrome', 'chromium']:
# prevents headless chromium from exiting after loading the page
cmdargs.append('--remote-debugging-port=9222')
# only needed on Windows, but no harm in specifying it everywhere
cmdargs.append('--disable-gpu')

2
testing/mozharness/configs/raptor/android_hw_config.py
View File

@ -7,7 +7,7 @@ config = {
"clobber",
"download-and-extract",
"populate-webroot",
"install-chrome",
"install-chromium-distribution",
"create-virtualenv",
"install",
"run-tests",

2
testing/mozharness/configs/raptor/linux_config.py
View File

@ -18,7 +18,7 @@ config = {
"clobber",
"download-and-extract",
"populate-webroot",
"install-chrome",
"install-chromium-distribution",
"create-virtualenv",
"install",
"run-tests",

2
testing/mozharness/configs/raptor/mac_config.py
View File

@ -21,7 +21,7 @@ config = {
"clobber",
"download-and-extract",
"populate-webroot",
"install-chrome",
"install-chromium-distribution",
"create-virtualenv",
"install",
"run-tests",

2
testing/mozharness/configs/raptor/windows_config.py
View File

@ -25,7 +25,7 @@ config = {
"clobber",
"download-and-extract",
"populate-webroot",
"install-chrome",
"install-chromium-distribution",
"create-virtualenv",
"install",
"run-tests",

2
testing/mozharness/configs/raptor/windows_vm_config.py
View File

@ -24,7 +24,7 @@ config = {
"clobber",
"download-and-extract",
"populate-webroot",
"install-chrome",
"install-chromium-distribution",
"create-virtualenv",
"install",
"run-tests",

65
testing/mozharness/mozharness/mozilla/testing/raptor.py
View File

@ -56,7 +56,7 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
}],
[["--app"],
{"default": "firefox",
"choices": ["firefox", "chrome", "geckoview", "fennec", "refbrow", "fenix"],
"choices": ["firefox", "chrome", "chromium", "fennec", "geckoview", "refbrow", "fenix"],
"dest": "app",
"help": "name of the application we are testing (default: firefox)"
}],
@ -158,7 +158,7 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
kwargs.setdefault('all_actions', ['clobber',
'download-and-extract',
'populate-webroot',
'install-chrome',
'install-chromium-distribution',
'create-virtualenv',
'install',
'run-tests',
@ -166,7 +166,7 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
kwargs.setdefault('default_actions', ['clobber',
'download-and-extract',
'populate-webroot',
'install-chrome',
'install-chromium-distribution',
'create-virtualenv',
'install',
'run-tests',
@ -258,38 +258,59 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
self.abs_dirs = abs_dirs
return self.abs_dirs
def install_chrome(self):
'''install google chrome in production; installation
def install_chromium_distribution(self):
'''install Google Chromium distribution in production; installation
requirements depend on the platform'''
if self.app != "chrome":
self.info("Google Chrome is not required")
linux, mac, win = 'linux', 'mac', 'win'
chrome, chromium = 'chrome', 'chromium'
available_chromium_dists = [chrome, chromium]
binary_location = {
chromium: {
linux: ['chrome-linux', 'chrome'],
mac: ['chrome-mac', 'Chromium.app', 'Contents', 'MacOS', 'Chromium'],
win: ['chrome-win', 'Chrome.exe']
},
}
if self.app == "chrome":
# remove this condition when integrating Google Chrome
raise ValueError("Google Chrome not currently integrated!")
if self.app not in available_chromium_dists:
self.info("Google Chrome or Chromium distributions are not required.")
return
chromium_dist = self.app
if self.config.get("run_local"):
self.info("expecting Google Chrome to be pre-installed locally")
self.info("expecting %s to be pre-installed locally" % chromium_dist)
return
self.info("Getting fetched chromium build")
self.chrome_dest = os.path.normpath(os.path.abspath(os.environ['MOZ_FETCHES_DIR']))
self.info("Getting fetched %s build" % chromium_dist)
self.chromium_dist_dest = os.path.normpath(os.path.abspath(os.environ['MOZ_FETCHES_DIR']))
if 'mac' in self.platform_name():
self.chrome_path = os.path.join(self.chrome_dest, 'chrome-mac', 'Chromium.app',
'Contents', 'MacOS', 'Chromium')
if mac in self.platform_name():
self.chromium_dist_path = os.path.join(self.chromium_dist_dest,
*binary_location[chromium_dist][mac])
elif 'linux' in self.platform_name():
self.chrome_path = os.path.join(self.chrome_dest, 'chrome-linux', 'chrome')
elif linux in self.platform_name():
self.chromium_dist_path = os.path.join(self.chromium_dist_dest,
*binary_location[chromium_dist][linux])
else:
self.chrome_path = os.path.join(self.chrome_dest, 'chrome-win', 'Chrome.exe')
self.chromium_dist_path = os.path.join(self.chromium_dist_dest,
*binary_location[chromium_dist][win])
self.info("chrome dest is: %s" % self.chrome_dest)
self.info("chrome path is: %s" % self.chrome_path)
self.info("%s dest is: %s" % (chromium_dist, self.chromium_dist_dest))
self.info("%s path is: %s" % (chromium_dist, self.chromium_dist_path))
# now ensure chrome binary exists
if os.path.exists(self.chrome_path):
self.info("successfully installed Google Chrome to: %s" % self.chrome_path)
if os.path.exists(self.chromium_dist_path):
self.info("successfully installed %s to: %s"
% (chromium_dist, self.chromium_dist_path))
else:
self.info("abort: failed to install Google Chrome")
self.info("abort: failed to install %s" % chromium_dist)
def raptor_options(self, args=None, **kw):
"""return options to raptor"""
@ -314,7 +335,7 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin):
if not self.run_local:
# when running locally we already set the chrome binary above in init; here
# in production we aready installed chrome, so set the binary path to our install
kw_options['binary'] = self.chrome_path
kw_options['binary'] = self.chromium_dist_path
# options overwritten from **kw
if 'test' in self.config:

7
testing/raptor/mach_commands.py
View File

@ -114,7 +114,12 @@ class RaptorRunner(MozbuildObject):
shutil.copytree(path, dest)
def make_config(self):
default_actions = ['populate-webroot', 'install-chrome', 'create-virtualenv', 'run-tests']
default_actions = [
'populate-webroot',
'install-chromium-distribution',
'create-virtualenv',
'run-tests'
]
self.config = {
'run_local': True,
'binary_path': self.binary_path,

32
testing/raptor/raptor/cmdline.py
View File

@ -8,24 +8,34 @@ import os
from mozlog.commandline import add_logging_group
(FIREFOX,
CHROME,
CHROMIUM) = DESKTOP_APPS = ["firefox", "chrome", "chromium"]
(FENNEC,
GECKOVIEW,
REFBROW,
FENIX) = FIREFOX_ANDROID_APPS = ["fennec", "geckoview", "refbrow", "fenix"]
CHROMIUM_DISTROS = [CHROME, CHROMIUM]
APPS = {
"firefox": {
FIREFOX: {
"long_name": "Firefox Desktop"},
"chrome": {
CHROME: {
"long_name": "Google Chrome Desktop"},
"fennec": {
CHROMIUM: {
"long_name": "Google Chromium Desktop"},
FENNEC: {
"long_name": "Firefox Fennec on Android"},
"geckoview": {
GECKOVIEW: {
"long_name": "Firefox Geckoview on Android",
"default_activity": "GeckoViewActivity"},
"refbrow": {
REFBROW: {
"long_name": "Firefox Android Components Reference Browser",
"default_activity": "BrowserTestActivity"},
"fenix": {
FENIX: {
"long_name": "Firefox Android Fenix Browser",
"default_activity": "HomeActivity"}
}
INTEGRATED_APPS = list(APPS.keys())
def print_all_activities():
@ -114,7 +124,7 @@ def verify_options(parser, args):
parser.error("--binary is required!")
# if running on a desktop browser make sure the binary exists
if args.app in ["firefox", "chrome"]:
if args.app in DESKTOP_APPS:
if not os.path.isfile(args.binary):
parser.error("{binary} does not exist!".format(**ctx))
@ -161,13 +171,17 @@ class _StopAction(argparse.Action):
class _PrintTests(_StopAction):
def __init__(self, integrated_apps=INTEGRATED_APPS, *args, **kwargs):
super(_PrintTests, self).__init__(*args, **kwargs)
self.integrated_apps = integrated_apps
def __call__(self, parser, namespace, values, option_string=None):
from manifestparser import TestManifest
here = os.path.abspath(os.path.dirname(__file__))
raptor_ini = os.path.join(here, 'raptor.ini')
for _app in ["firefox", "chrome", "fennec", "geckoview", "refbrow", "fenix"]:
for _app in self.integrated_apps:
test_manifest = TestManifest([raptor_ini], strict=False)
info = {"app": _app}
available_tests = test_manifest.active_tests(exists=False,

11
testing/raptor/raptor/raptor.py
View File

@ -46,7 +46,9 @@ except ImportError:
build = None
from benchmark import Benchmark
from cmdline import parse_args
from cmdline import (parse_args,
FIREFOX_ANDROID_APPS,
CHROMIUM_DISTROS)
from control_server import RaptorControlServer
from gen_test_config import gen_test_config
from outputhandler import OutputHandler
@ -93,7 +95,7 @@ class Raptor(object):
self.post_startup_delay = post_startup_delay
self.device = None
self.profile_class = app
self.firefox_android_apps = ['fennec', 'geckoview', 'refbrow', 'fenix']
self.firefox_android_apps = FIREFOX_ANDROID_APPS
# debug mode is currently only supported when running locally
self.debug_mode = debug_mode if self.config['run_local'] else False
@ -241,7 +243,8 @@ class Raptor(object):
self.profile.addons.remove_addon(self.webext_id)
# for chrome the addon is just a list (appended to cmd line)
if self.config['app'] in ["chrome", "chrome-android"]:
chrome_apps = CHROMIUM_DISTROS + ["chrome-android", "chromium-android"]
if self.config['app'] in chrome_apps:
self.profile.addons.remove(self.raptor_webext)
def set_test_browser_prefs(self, test_prefs):
@ -829,7 +832,7 @@ def main(args=sys.argv[1:]):
if args.app == "firefox":
raptor_class = RaptorDesktopFirefox
elif args.app == "chrome":
elif args.app in CHROMIUM_DISTROS:
raptor_class = RaptorDesktopChrome
else:
raptor_class = RaptorAndroid

3
testing/raptor/raptor/tests/raptor-assorted-dom.ini
View File

@ -14,3 +14,6 @@ apps = firefox
[raptor-assorted-dom-chrome]
apps = chrome
[raptor-assorted-dom-chromium]
apps = chromium

5
testing/raptor/raptor/tests/raptor-motionmark-animometer.ini
View File

@ -2,7 +2,7 @@
# 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/.
# motionmark benchmark for firefox and chrome
# motionmark benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark
@ -20,3 +20,6 @@ apps = firefox
[raptor-motionmark-animometer-chrome]
apps = chrome
[raptor-motionmark-animometer-chromium]
apps = chromium

5
testing/raptor/raptor/tests/raptor-motionmark-htmlsuite.ini
View File

@ -2,7 +2,7 @@
# 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/.
# motionmark benchmark for firefox and chrome
# motionmark benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark
@ -20,3 +20,6 @@ apps = firefox
[raptor-motionmark-htmlsuite-chrome]
apps = chrome
[raptor-motionmark-htmlsuite-chromium]
apps = chromium

5
testing/raptor/raptor/tests/raptor-speedometer.ini
View File

@ -2,7 +2,7 @@
# 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/.
# speedometer benchmark for firefox and chrome
# speedometer benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark
@ -23,6 +23,9 @@ apps = firefox
[raptor-speedometer-chrome]
apps = chrome
[raptor-speedometer-chromium]
apps = chromium
[raptor-speedometer-geckoview]
page_timeout = 900000 # 15 min
page_cycles = 1

5
testing/raptor/raptor/tests/raptor-stylebench.ini
View File

@ -2,7 +2,7 @@
# 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/.
# speedometer benchmark for firefox and chrome
# speedometer benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark
@ -20,3 +20,6 @@ apps = firefox
[raptor-stylebench-chrome]
apps = chrome
[raptor-stylebench-chromium]
apps = chromium

5
testing/raptor/raptor/tests/raptor-sunspider.ini
View File

@ -2,7 +2,7 @@
# 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/.
# sunspider benchmark for firefox and chrome
# sunspider benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark
@ -20,3 +20,6 @@ apps = firefox
[raptor-sunspider-chrome]
apps = chrome
[raptor-sunspider-chromium]
apps = chromium

24
testing/raptor/raptor/tests/raptor-tp6-1.ini
View File

@ -69,3 +69,27 @@ apps = chrome
test_url = https://www.youtube.com
playback_recordings = youtube.mp
measure = fcp, loadtime
[raptor-tp6-amazon-chromium]
apps = chromium
test_url = https://www.amazon.com/s/url=search-alias%3Daps&field-keywords=laptop
playback_recordings = amazon.mp
measure = fcp, loadtime
[raptor-tp6-facebook-chromium]
apps = chromium
test_url = https://www.facebook.com
playback_recordings = facebook.mp
measure = fcp, loadtime
[raptor-tp6-google-chromium]
apps = chromium
test_url = https://www.google.com/#hl=en&q=barack+obama
playback_recordings = google-search.mp
measure = fcp, loadtime
[raptor-tp6-youtube-chromium]
apps = chromium
test_url = https://www.youtube.com
playback_recordings = youtube.mp
measure = fcp, loadtime

15
testing/raptor/raptor/tests/raptor-tp6-10.ini
View File

@ -45,3 +45,18 @@ test_url = https://www.tumblr.com/dashboard
playback_pageset_manifest = mitmproxy-recordings-raptor-tumblr.manifest
playback_recordings = tumblr.mp
measure = fcp, loadtime
[raptor-tp6-paypal-chromium]
apps = chromium
test_url = https://www.paypal.com/myaccount/summary/
playback_pageset_manifest = mitmproxy-recordings-raptor-paypal.manifest
playback_recordings = paypal.mp
measure = fcp, loadtime
disabled = Bug 1542757 - Investigate and fix TEST-UNEXPECTED-FAIL: test 'raptor-tp6-paypal-chrome'
[raptor-tp6-tumblr-chromium]
apps = chromium
test_url = https://www.tumblr.com/dashboard
playback_pageset_manifest = mitmproxy-recordings-raptor-tumblr.manifest
playback_recordings = tumblr.mp
measure = fcp, loadtime

18
testing/raptor/raptor/tests/raptor-tp6-2.ini
View File

@ -53,3 +53,21 @@ apps = chrome
test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
playback_recordings = google-slides.mp
measure = fcp, loadtime
[raptor-tp6-docs-chromium]
apps = chromium
test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
playback_recordings = google-docs.mp
measure = fcp, loadtime
[raptor-tp6-sheets-chromium]
apps = chromium
test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
playback_recordings = google-sheets.mp
measure = fcp, loadtime
[raptor-tp6-slides-chromium]
apps = chromium
test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
playback_recordings = google-slides.mp
measure = fcp, loadtime

19
testing/raptor/raptor/tests/raptor-tp6-3.ini
View File

@ -54,3 +54,22 @@ apps = chrome
test_url = http://fandom.wikia.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
playback_recordings = wikia.mp
measure = fcp, loadtime
[raptor-tp6-imdb-chromium]
apps = chromium
test_url = https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2
playback_recordings = imdb.mp
measure = fcp, loadtime
[raptor-tp6-imgur-chromium]
apps = chromium
test_url = https://imgur.com/gallery/m5tYJL6
playback_recordings = imgur.mp
measure = fcp, loadtime
disabled = Bug 1529918 - raptor-tp6-imgur-chrome fails to load with latest Chromium update
[raptor-tp6-wikia-chromium]
apps = chromium
test_url = http://fandom.wikia.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
playback_recordings = wikia.mp
measure = fcp, loadtime

12
testing/raptor/raptor/tests/raptor-tp6-4.ini
View File

@ -41,3 +41,15 @@ apps = chrome
test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
playback_recordings = yandex.mp
measure = fcp, loadtime
[raptor-tp6-bing-chromium]
apps = chromium
test_url = https://www.bing.com/search?q=barack+obama
playback_recordings = bing.mp
measure = fcp, loadtime
[raptor-tp6-yandex-chromium]
apps = chromium
test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
playback_recordings = yandex.mp
measure = fcp, loadtime

12
testing/raptor/raptor/tests/raptor-tp6-5.ini
View File

@ -42,3 +42,15 @@ apps = chrome
test_url = https://www.microsoft.com/en-us/windows/get-windows-10
playback_recordings = microsoft.mp
measure = fcp, loadtime
[raptor-tp6-apple-chromium]
apps = chromium
test_url = https://www.apple.com/macbook-pro/
playback_recordings = apple.mp
measure = fcp, loadtime
[raptor-tp6-microsoft-chromium]
apps = chromium
test_url = https://www.microsoft.com/en-us/windows/get-windows-10
playback_recordings = microsoft.mp
measure = fcp, loadtime

13
testing/raptor/raptor/tests/raptor-tp6-6.ini
View File

@ -43,3 +43,16 @@ test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-pl
playback_pageset_manifest = mitmproxy-recordings-raptor-yahoo-news.manifest
playback_recordings = yahoo-news.mp
measure = fcp, loadtime
[raptor-tp6-reddit-chromium]
apps = chromium
test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
playback_recordings = reddit.mp
measure = fcp, loadtime
[raptor-tp6-yahoo-news-chromium]
apps = chromium
test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
playback_pageset_manifest = mitmproxy-recordings-raptor-yahoo-news.manifest
playback_recordings = yahoo-news.mp
measure = fcp, loadtime

20
testing/raptor/raptor/tests/raptor-tp6-7.ini
View File

@ -57,3 +57,23 @@ test_url = https://mail.yahoo.com/
playback_pageset_manifest = mitmproxy-tp6-yahoo-mail.manifest
playback_recordings = yahoo-mail.mp
measure = fcp, loadtime
[raptor-tp6-instagram-chromium]
apps = chromium
test_url = https://www.instagram.com/
playback_recordings = instagram.mp
measure = fcp, loadtime
[raptor-tp6-twitter-chromium]
apps = chromium
test_url = https://twitter.com/BarackObama
playback_pageset_manifest = mitmproxy-recordings-raptor-twitter.manifest
playback_recordings = twitter.mp
measure = fcp, loadtime
[raptor-tp6-yahoo-mail-chromium]
apps = chromium
test_url = https://mail.yahoo.com/
playback_pageset_manifest = mitmproxy-tp6-yahoo-mail.manifest
playback_recordings = yahoo-mail.mp
measure = fcp, loadtime

28
testing/raptor/raptor/tests/raptor-tp6-8-404.ini
View File

@ -73,3 +73,31 @@ test_url = https://en.wikipedia.org/wiki/Barack_Obama
playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia-404.manifest
playback_recordings = wikipedia.mp
measure = fcp, loadtime
[raptor-tp6-ebay-mitm-404-recordings-202-chromium]
apps = chromium
test_url = https://www.ebay.com/
playback_pageset_manifest = mitmproxy-recordings-raptor-ebay.manifest
playback_recordings = ebay.mp
measure = fcp, loadtime
[raptor-tp6-wikipedia-mitm-404-recordings-202-chromium]
apps = chromium
test_url = https://en.wikipedia.org/wiki/Barack_Obama
playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia.manifest
playback_recordings = wikipedia.mp
measure = fcp, loadtime
[raptor-tp6-ebay-mitm-404-recordings-404-chromium]
apps = chromium
test_url = https://www.ebay.com/
playback_pageset_manifest = mitmproxy-recordings-raptor-ebay-404.manifest
playback_recordings = ebay.mp
measure = fcp, loadtime
[raptor-tp6-wikipedia-mitm-404-recordings-404-chromium]
apps = chromium
test_url = https://en.wikipedia.org/wiki/Barack_Obama
playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia-404.manifest
playback_recordings = wikipedia.mp
measure = fcp, loadtime

14
testing/raptor/raptor/tests/raptor-tp6-8.ini
View File

@ -44,3 +44,17 @@ test_url = https://en.wikipedia.org/wiki/Barack_Obama
playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia.manifest
playback_recordings = wikipedia.mp
measure = fcp, loadtime
[raptor-tp6-ebay-chromium]
apps = chromium
test_url = https://www.ebay.com/
playback_pageset_manifest = mitmproxy-recordings-raptor-ebay.manifest
playback_recordings = ebay.mp
measure = fcp, loadtime
[raptor-tp6-wikipedia-chromium]
apps = chromium
test_url = https://en.wikipedia.org/wiki/Barack_Obama
playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia.manifest
playback_recordings = wikipedia.mp
measure = fcp, loadtime

14
testing/raptor/raptor/tests/raptor-tp6-9.ini
View File

@ -44,3 +44,17 @@ test_url = https://pinterest.com/
playback_pageset_manifest = mitmproxy-recordings-raptor-pinterest.manifest
playback_recordings = pinterest.mp
measure = fcp, loadtime
[raptor-tp6-google-mail-chromium]
apps = chromium
test_url = https://mail.google.com/
playback_pageset_manifest = mitmproxy-recordings-raptor-google-mail.manifest
playback_recordings = google-mail.mp
measure = fcp, loadtime
[raptor-tp6-pinterest-chromium]
apps = chromium
test_url = https://pinterest.com/
playback_pageset_manifest = mitmproxy-recordings-raptor-pinterest.manifest
playback_recordings = pinterest.mp
measure = fcp, loadtime

3
testing/raptor/raptor/tests/raptor-unity-webgl.ini
View File

@ -15,6 +15,9 @@ apps = firefox
[raptor-unity-webgl-chrome]
apps = chrome
[raptor-unity-webgl-chromium]
apps = chromium
[raptor-unity-webgl-geckoview]
page_timeout = 900000 # 15 min
page_cycles = 1

2
testing/raptor/raptor/tests/raptor-wasm-godot-baseline.ini
View File

@ -2,7 +2,7 @@
# 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/.
# Wasm-godot benchmark for firefox and chrome
# Wasm-godot benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark

10
testing/raptor/raptor/tests/raptor-wasm-godot-cranelift.ini
View File

@ -2,19 +2,19 @@
# 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/.
# Wasm-Godot benchmark for firefox and chrome
# Wasm-Godot benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark
test_url = http://localhost:<port>/wasm-godot/index.html
test_url = http://localhost:<port>/wasm-godot/index.html
page_cycles = 5
page_timeout = 120000
unit = ms
lower_is_better = true
alert_threshold = 2.0
newtab_per_cycle = true
gecko_profile_interval = 1
gecko_profile_entries = 8000000
newtab_per_cycle = true
gecko_profile_interval = 1
gecko_profile_entries = 8000000
[raptor-wasm-godot-cranelift-firefox]
apps = firefox

2
testing/raptor/raptor/tests/raptor-wasm-godot-ion.ini
View File

@ -2,7 +2,7 @@
# 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/.
# Wasm-godot benchmark for firefox and chrome
# Wasm-godot benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark

5
testing/raptor/raptor/tests/raptor-wasm-godot.ini
View File

@ -2,7 +2,7 @@
# 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/.
# Wasm-godot benchmark for firefox and chrome
# Wasm-godot benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark
@ -21,3 +21,6 @@ apps = firefox
[raptor-wasm-godot-chrome]
apps = chrome
[raptor-wasm-godot-chromium]
apps = chromium

2
testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini
View File

@ -2,7 +2,7 @@
# 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/.
# Wasm-Misc benchmark for firefox and chrome
# Wasm-Misc benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark

2
testing/raptor/raptor/tests/raptor-wasm-misc-cranelift.ini
View File

@ -2,7 +2,7 @@
# 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/.
# Wasm-Misc benchmark for firefox and chrome
# Wasm-Misc benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark

2
testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini
View File

@ -2,7 +2,7 @@
# 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/.
# Wasm-Misc benchmark for firefox and chrome
# Wasm-Misc benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark

5
testing/raptor/raptor/tests/raptor-wasm-misc.ini
View File

@ -2,7 +2,7 @@
# 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/.
# Wasm-Misc benchmark for firefox and chrome
# Wasm-Misc benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark
@ -20,3 +20,6 @@ apps = firefox
[raptor-wasm-misc-chrome]
apps = chrome
[raptor-wasm-misc-chromium]
apps = chromium

5
testing/raptor/raptor/tests/raptor-webaudio.ini
View File

@ -2,7 +2,7 @@
# 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/.
# speedometer benchmark for firefox and chrome
# speedometer benchmark for firefox and chromium distributions
[DEFAULT]
type = benchmark
@ -20,3 +20,6 @@ apps = firefox
[raptor-webaudio-chrome]
apps = chrome
[raptor-webaudio-chromium]
apps = chromium

21
testing/raptor/test/test_manifest.py
View File

@ -46,6 +46,15 @@ VALID_MANIFESTS = [{'apps': 'firefox',
'lower_is_better': False,
'alert_threshold': 2.0,
'manifest': 'valid_details_1'},
{'apps': 'chromium',
'type': 'benchmark',
'page_cycles': 5,
'test_url': 'http://www.test-url/goes/here',
'measure': 'fcp',
'unit': 'score',
'lower_is_better': False,
'alert_threshold': 2.0,
'manifest': 'valid_details_1'},
{'apps': 'geckoview',
'type': 'pageload',
'cold': True,
@ -80,6 +89,16 @@ INVALID_MANIFESTS = [{'apps': 'firefox',
'alert_threshold': 2.0,
'playback': 'mitmproxy',
'manifest': 'invalid_details_1'},
{'apps': 'chromium',
'type': 'pageload',
'page_cycles': 25,
'test_url': 'http://www.test-url/goes/here',
'measure': 'fnbpaint, fcp',
'unit': 'ms',
'lower_is_better': True,
'alert_threshold': 2.0,
'playback': 'mitmproxy',
'manifest': 'invalid_details_1'},
{'apps': 'firefox',
'type': 'pageload',
'page_cycles': 25,
@ -96,7 +115,7 @@ INVALID_MANIFESTS = [{'apps': 'firefox',
'manifest': 'invalid_details_2'}]
@pytest.mark.parametrize('app', ['firefox', 'chrome', 'geckoview', 'refbrow', 'fenix'])
@pytest.mark.parametrize('app', ['firefox', 'chrome', 'chromium', 'geckoview', 'refbrow', 'fenix'])
def test_get_browser_test_list(app):
test_list = get_browser_test_list(app, run_local=True)
if app != "fenix":

2
testing/raptor/test/test_raptor.py
View File

@ -42,6 +42,7 @@ class TestBrowserThread(threading.Thread):
@pytest.mark.parametrize("raptor_class, app_name", [
[RaptorDesktopFirefox, "firefox"],
[RaptorDesktopChrome, "chrome"],
[RaptorDesktopChrome, "chromium"],
[RaptorAndroid, "fennec"],
[RaptorAndroid, "geckoview"],
])
@ -93,6 +94,7 @@ def test_start_and_stop_server(raptor):
@pytest.mark.parametrize('app', [
'firefox',
pytest.mark.xfail('chrome'),
pytest.mark.xfail('chromium'),
])
def test_start_browser(get_binary, app):
binary = get_binary(app)