Bug 987406 - Set up certificate_path processing, r=aki
authorJonathan Griffin <jgriffin@mozilla.com>
Fri, 18 Apr 2014 11:11:53 -0700
changeset 2663 d92a223fe0087624b29d5cf134d0295730b31bee
parent 2661 6121b5c47eb3c55b097abad423fc0f7904024703
child 2665 850e440da92005184e35e798c3b1fa76b2713673
push id1963
push userjgriffin@mozilla.com
push dateFri, 18 Apr 2014 18:12:04 +0000
reviewersaki
bugs987406
Bug 987406 - Set up certificate_path processing, r=aki
scripts/b2g_emulator_unittest.py
--- a/scripts/b2g_emulator_unittest.py
+++ b/scripts/b2g_emulator_unittest.py
@@ -156,16 +156,18 @@ class B2GEmulatorTest(TestingMixin, Tool
         dirs['abs_emulator_dir'] = os.path.join(
             abs_dirs['abs_work_dir'], 'emulator')
         dirs['abs_blob_upload_dir'] = os.path.join(
             abs_dirs['abs_work_dir'], 'blobber_upload_dir')
         dirs['abs_b2g-distro_dir'] = os.path.join(
             dirs['abs_emulator_dir'], 'b2g-distro')
         dirs['abs_mochitest_dir'] = os.path.join(
             dirs['abs_test_install_dir'], 'mochitest')
+        dirs['abs_certs_dir'] = os.path.join(
+            dirs['abs_test_install_dir'], 'certs')
         dirs['abs_modules_dir'] = os.path.join(
             dirs['abs_test_install_dir'], 'modules')
         dirs['abs_reftest_dir'] = os.path.join(
             dirs['abs_test_install_dir'], 'reftest')
         dirs['abs_crashtest_dir'] = os.path.join(
             dirs['abs_test_install_dir'], 'reftest')
         dirs['abs_jsreftest_dir'] = os.path.join(
             dirs['abs_test_install_dir'], 'reftest')
@@ -259,16 +261,17 @@ class B2GEmulatorTest(TestingMixin, Tool
             'modules_dir': dirs['abs_modules_dir'],
             'remote_webserver': self.config['remote_webserver'],
             'xre_path': os.path.join(dirs['abs_xre_dir'], 'bin'),
             'test_manifest': self.test_manifest,
             'symbols_path': self.symbols_path,
             'busybox': self.busybox_path,
             'total_chunks': self.config.get('total_chunks'),
             'this_chunk': self.config.get('this_chunk'),
+            'certificate_path': dirs['abs_certs_dir'],
         }
 
         # Bug 978233 - hack to get around multiple mochitest manifest arguments
         if suite == 'mochitest':
             if os.path.isfile(os.path.join(dirs['abs_mochitest_dir'], self.test_manifest)):
                 if self.test_manifest.endswith('.ini'):
                     manifest_param = '--manifest'
                 else: