Bug 1499043 - ensure JSGC_DISABLE_POISONING is enable for raptor and jsshell-bench tests r=jmaher
authorflorin.strugariu <bebe@mozilla.ro>
Wed, 17 Oct 2018 09:29:26 +0000
changeset 500110 2d2cb65d5099338233ccaf0908863ed7382b12a1
parent 500109 86474265d1630457d800c782f6ec072af87cccd3
child 500111 5cc98bf772f726daa10abb0f5e3305c6466c6c53
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1499043
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1499043 - ensure JSGC_DISABLE_POISONING is enable for raptor and jsshell-bench tests r=jmaher Differential Revision: https://phabricator.services.mozilla.com/D8729
testing/jsshell/benchmark.py
testing/mozharness/mozharness/mozilla/testing/raptor.py
--- a/testing/jsshell/benchmark.py
+++ b/testing/jsshell/benchmark.py
@@ -105,22 +105,29 @@ class Benchmark(object):
         if fetches_dir and os.path.isdir(fetches_dir):
             fetchdir = os.path.join(fetches_dir, self.name)
             if os.path.isdir(fetchdir):
                 shutil.copytree(fetchdir, self.path)
 
     def run(self):
         self.reset()
 
+        # Update the environment variables
+        env = os.environ.copy()
+
+        # disable "GC poisoning" Bug# 1499043
+        env['JSGC_DISABLE_POISONING'] = '1'
+
         process_args = {
             'cmd': self.command,
             'cwd': self.path,
             'onFinish': self.collect_results,
             'processOutputLine': self.process_line,
             'stream': sys.stdout,
+            'env': env,
         }
         proc = ProcessHandler(**process_args)
         proc.run()
         return proc.wait()
 
 
 class RunOnceBenchmark(Benchmark):
     def collect_results(self):
--- a/testing/mozharness/mozharness/mozilla/testing/raptor.py
+++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py
@@ -435,16 +435,19 @@ class Raptor(TestingMixin, MercurialScri
             self.info("webrender is enabled so setting MOZ_WEBRENDER=1 and MOZ_ACCELERATED=1")
             env['MOZ_WEBRENDER'] = '1'
             env['MOZ_ACCELERATED'] = '1'
 
         # mitmproxy needs path to mozharness when installing the cert, and tooltool
         env['SCRIPTSPATH'] = scripts_path
         env['EXTERNALTOOLSPATH'] = external_tools_path
 
+        # disable "GC poisoning" Bug# 1499043
+        env['JSGC_DISABLE_POISONING'] = '1'
+
         if self.repo_path is not None:
             env['MOZ_DEVELOPER_REPO_DIR'] = self.repo_path
         if self.obj_path is not None:
             env['MOZ_DEVELOPER_OBJ_DIR'] = self.obj_path
 
         # sets a timeout for how long raptor should run without output
         output_timeout = self.config.get('raptor_output_timeout', 3600)
         # run raptor tests