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 1181867 - correct app_path, set abs_res_dir for webapprt; r=jlund

Browse Source
This commit is contained in:
Myk Melez 2015-07-20 09:34:57 -07:00
parent 1a7d966151
commit e051853a00
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
testing/mozharness/scripts/desktop_unittest.py
View File

@ -288,6 +288,32 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
self.symbols_url = symbols_url
return self.symbols_url
def get_webapprt_path(self, res_dir, mochitest_dir):
"""Get the path to the webapp runtime binary.
On Mac, we copy the stub from the resources dir to the test app bundle,
since we have to run it from the executable directory of a bundle
in order for its windows to appear. Ideally, the build system would do
this for us at build time, and we should find a way for it to do that.
"""
exe_suffix = self.config.get('exe_suffix', '')
app_name = 'webapprt-stub' + exe_suffix
app_path = os.path.join(res_dir, app_name)
if self._is_darwin():
mac_dir_name = os.path.join(
mochitest_dir,
'webapprtChrome',
'webapprt',
'test',
'chrome',
'TestApp.app',
'Contents',
'MacOS')
mac_app_name = 'webapprt' + exe_suffix
mac_app_path = os.path.join(mac_dir_name, mac_app_name)
self.copyfile(app_path, mac_app_path, copystat=True)
return mac_app_path
return app_path
def _query_abs_base_cmd(self, suite_category, suite):
if self.binary_path:
c = self.config
@ -298,18 +324,13 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
abs_app_dir = self.query_abs_app_dir()
abs_res_dir = self.query_abs_res_dir()
webapprt_path = os.path.join(os.path.dirname(self.binary_path),
'webapprt-stub')
if c.get('exe_suffix'):
webapprt_path += c['exe_suffix']
raw_log_file = os.path.join(dirs['abs_blob_upload_dir'],
'%s_raw.log' % suite)
str_format_values = {
'binary_path': self.binary_path,
'symbols_path': self._query_symbols_url(),
'abs_app_dir': abs_app_dir,
'app_path': webapprt_path,
'abs_res_dir': abs_res_dir,
'raw_log_file': raw_log_file,
}
# TestingMixin._download_and_extract_symbols() will set
@ -317,6 +338,9 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
if self.symbols_path:
str_format_values['symbols_path'] = self.symbols_path
if suite_category == 'webapprt':
str_format_values['app_path'] = self.get_webapprt_path(abs_res_dir, dirs['abs_mochitest_dir'])
if c['e10s']:
base_cmd.append('--e10s')