tor-browser

commit e899312430974d25623b6c7978ccd98dcc1fe3b3
parent b8005febde95f2a3b1e99b8977091f4579a7b7a1
Author: Cosmin Sabou <csabou@mozilla.com>
Date:   Wed,  8 Oct 2025 06:08:08 +0300

Revert "Bug 1992667 - Update trainhop jobs to launch xpcshell while loading libraries from the trainhop archive. r=jmaher" for causing _trainHop related mochitest failures.

This reverts commit 405c2bb5382aa6536eb44886f69bc352c1a90f5a.

Diffstat:
M
testing/mochitest/runtests.py
 | 
10
----------

1 file changed, 0 insertions(+), 10 deletions(-)
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
@@ -516,11 +516,6 @@ class MochitestServer:
             self._httpdPath = SCRIPT_DIR
         self._httpdPath = os.path.abspath(self._httpdPath)
 
-        if "browser.newtabpage.trainhopAddon.version=any" in options.get(
-            "extraPrefs", []
-        ):
-            self._trainHop = True
-
         MochitestServer.instance_count += 1
 
     def start(self):
@@ -534,11 +529,6 @@ class MochitestServer:
         else:
             env["LD_LIBRARY_PATH"] = ":".join([self._xrePath, env["LD_LIBRARY_PATH"]])
 
-        if self._trainHop:
-            env["LD_LIBRARY_PATH"] = ":".join(
-                [os.path.join(os.path.dirname(here), "bin"), env["LD_LIBRARY_PATH"]]
-            )
-
         # When running with an ASan build, our xpcshell server will also be ASan-enabled,
         # thus consuming too much resources when running together with the browser on
         # the test machines. Try to limit the amount of resources by disabling certain