From 556e7a70f4fa015b6949ae453dde805c3d8f2944 Mon Sep 17 00:00:00 2001 From: aleth Date: Sat, 20 Feb 2016 23:17:55 +0100 Subject: [PATCH] Bug 1093012 - Ensure plugins and extensions are placed in Contents/Resources on OSX for mozmill tests. r=jlund --- .../mozharness/scripts/desktop_unittest.py | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py index adaa88b19f2..f28a8b10b3c 100755 --- a/testing/mozharness/scripts/desktop_unittest.py +++ b/testing/mozharness/scripts/desktop_unittest.py @@ -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'],