wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1197224 - Part 2: configure mozharness script to run media tests on Windows, r=jgriffin, DONTBUILD because NPOTB

Browse Source
This commit is contained in:
Maja Frydrychowicz 2015-09-29 07:48:47 -04:00
parent f212ebffad
commit 668f5b5881
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/mozharness/configs/mediatests/buildbot_posix_config.py
View File

@ -41,9 +41,9 @@ config = {
"firefox_media_repo": 'https://github.com/mjzffr/firefox-media-tests.git',
"firefox_media_branch": 'master',
"firefox_media_rev": '82c45fba24457b5fe447e967bbcaaec5eb14e3ee',
"firefox_media_rev": 'b11d6c3d7f6af166be314d2ac6673e78c1edb566',
"firefox_ui_repo": 'https://github.com/mozilla/firefox-ui-tests.git',
"firefox_ui_branch": 'master',
"firefox_ui_branch": 'mozilla-central',
"firefox_ui_rev": '6d6d57917f85399e903ac69b7e4297091b2d474c',
}

9
testing/mozharness/configs/mediatests/buildbot_windows_config.py
View File

@ -17,7 +17,10 @@ config = {
'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
'%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
'tooltool.py': [sys.executable, 'C:/mozilla-build/tooltool.py'],
'gittool.py': os.path.join(external_tools_path, 'gittool.py'),
'gittool.py': [sys.executable,
os.path.join(external_tools_path, 'gittool.py')],
'hgtool.py': [sys.executable,
os.path.join(external_tools_path, 'hgtool.py')],
},
@ -49,9 +52,9 @@ config = {
"firefox_media_repo": 'https://github.com/mjzffr/firefox-media-tests.git',
"firefox_media_branch": 'master',
"firefox_media_rev": '82c45fba24457b5fe447e967bbcaaec5eb14e3ee',
"firefox_media_rev": 'b11d6c3d7f6af166be314d2ac6673e78c1edb566',
"firefox_ui_repo": 'https://github.com/mozilla/firefox-ui-tests.git',
"firefox_ui_branch": 'master',
"firefox_ui_branch": 'mozilla-central',
"firefox_ui_rev": '6d6d57917f85399e903ac69b7e4297091b2d474c',
}

20
testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
View File

@ -157,15 +157,14 @@ class FirefoxMediaTestsBase(TestingMixin, VCSToolsScript):
@PreScriptAction('create-virtualenv')
def _pre_create_virtualenv(self, action):
dirs = self.query_abs_dirs()
# cwd is $workspace/build
requirements_file = os.path.join(dirs['firefox_media_dir'],
'requirements.txt')
if os.path.isfile(requirements_file):
self.register_virtualenv_module(requirements=[requirements_file])
self.register_virtualenv_module(name='firefox-ui-tests',
url=dirs['firefox_ui_dir'],
method='pip',
editable='true')
url=dirs['firefox_ui_dir'])
self.register_virtualenv_module(name='firefox-media-tests',
url=dirs['firefox_media_dir'],
method='pip',
editable='true')
url=dirs['firefox_media_dir'])
def query_abs_dirs(self):
if self.abs_dirs:
@ -209,7 +208,12 @@ class FirefoxMediaTestsBase(TestingMixin, VCSToolsScript):
if not self.binary_path:
self.fatal("Binary path could not be determined. "
"Should be set by default during 'install' action.")
cmd = ['firefox-media-tests']
dirs = self.query_abs_dirs()
venv_python_path = self.query_python_path()
runner_script = os.path.join(dirs['firefox_media_dir'],
'media_test_harness',
'runtests.py')
cmd = [venv_python_path, runner_script]
cmd += ['--binary', self.binary_path]
if self.symbols_path:
cmd += ['--symbols-path', self.symbols_path]