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 1093012 - Ensure plugins and extensions are placed in Contents/Resources on OSX for mozmill tests. r=jlund

Browse Source
This commit is contained in:
aleth 2016-02-20 23:17:55 +01:00
parent 498dfa5d63
commit 556e7a70f4
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,8 +509,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
self._run_category_suites('mozmill',
preflight_run_method=self.preflight_mozmill)
def preflight_xpcshell(self, suites):
c = self.config
def preflight_copydirs(self, bin_name=None):
dirs = self.query_abs_dirs()
abs_app_dir = self.query_abs_app_dir()
@ -521,15 +520,16 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
abs_res_plugins_dir = os.path.join(abs_res_dir, 'plugins')
abs_res_extensions_dir = os.path.join(abs_res_dir, 'extensions')
self.mkdir_p(abs_res_plugins_dir)
self.info('copying %s to %s' % (os.path.join(dirs['abs_test_bin_dir'],
c['xpcshell_name']), os.path.join(abs_app_dir,
c['xpcshell_name'])))
shutil.copy2(os.path.join(dirs['abs_test_bin_dir'], c['xpcshell_name']),
os.path.join(abs_app_dir, c['xpcshell_name']))
if bin_name:
self.info('copying %s to %s' % (os.path.join(dirs['abs_test_bin_dir'],
bin_name), os.path.join(abs_app_dir, bin_name)))
shutil.copy2(os.path.join(dirs['abs_test_bin_dir'], bin_name),
os.path.join(abs_app_dir, bin_name))
self.copytree(dirs['abs_test_bin_components_dir'],
abs_res_components_dir,
overwrite='overwrite_if_exists')
self.mkdir_p(abs_res_plugins_dir)
self.copytree(dirs['abs_test_bin_plugins_dir'],
abs_res_plugins_dir,
overwrite='overwrite_if_exists')
@ -539,6 +539,9 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
abs_res_extensions_dir,
overwrite='overwrite_if_exists')
def preflight_xpcshell(self, suites):
self.preflight_copydirs(self.config['xpcshell_name'])
def preflight_cppunittest(self, suites):
abs_res_dir = self.query_abs_res_dir()
dirs = self.query_abs_dirs()
@ -566,19 +569,8 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
os.path.join(abs_app_dir))
def preflight_mozmill(self, suites):
self.preflight_copydirs()
dirs = self.query_abs_dirs()
abs_app_dir = self.query_abs_app_dir()
abs_app_plugins_dir = os.path.join(abs_app_dir, 'plugins')
abs_app_extensions_dir = os.path.join(abs_app_dir, 'extensions')
self.mkdir_p(abs_app_plugins_dir)
self.copytree(dirs['abs_test_bin_plugins_dir'],
abs_app_plugins_dir,
overwrite='overwrite_if_exists')
if os.path.isdir(dirs['abs_test_extensions_dir']):
self.copytree(dirs['abs_test_extensions_dir'],
abs_app_extensions_dir,
overwrite='overwrite_if_exists')
modules = ['jsbridge', 'mozmill']
for module in modules:
self.install_module(module=os.path.join(dirs['abs_mozmill_dir'],