Commit df265c52 authored Jun 15, 2026 by brizental

fixup! BB 43243: Modify mozharness scripts for Base Browser

tor-browser-bundle-testsuite#40107: Get NODEJS path from the
environment.

parent 9aa4dfe8

testing/mozharness/configs/android/android_common.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,8 +9,8 @@

		import os

		NODEJS_PATH = None
		if "MOZ_FETCHES_DIR" in os.environ:
		NODEJS_PATH = os.environ.get("NODEJS_PATH")
		if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
		NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/bin/node")

testing/mozharness/configs/unittests/linux_unittest.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ ADJUST_MOUSE_AND_SCREEN = False
		# Note: keep these Valgrind .sup file names consistent with those
		# in testing/mochitest/mochitest_options.py.
		VALGRIND_SUPP_DIR = os.path.join(os.getcwd(), "build/tests/mochitest")
		NODEJS_PATH = None
		if "MOZ_FETCHES_DIR" in os.environ:
		NODEJS_PATH = os.environ.get("NODEJS_PATH")
		if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
		NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/bin/node")

		VALGRIND_SUPP_CROSS_ARCH = os.path.join(VALGRIND_SUPP_DIR, "cross-architecture.sup")

testing/mozharness/configs/unittests/mac_unittest.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ import sys

		# OS Specifics
		INSTALLER_PATH = os.path.join(os.getcwd(), "installer.dmg")
		NODEJS_PATH = None
		if "MOZ_FETCHES_DIR" in os.environ:
		NODEJS_PATH = os.environ.get("NODEJS_PATH")
		if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
		NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/bin/node")

		XPCSHELL_NAME = "xpcshell"

testing/mozharness/configs/unittests/win_unittest.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,9 +9,9 @@ import sys
		# OS Specifics
		ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
		BINARY_PATH = os.path.join(ABS_WORK_DIR, "firefox", "firefox.exe")
		INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.zip")
		NODEJS_PATH = None
		if "MOZ_FETCHES_DIR" in os.environ:
		INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.exe")
		NODEJS_PATH = os.environ.get("NODEJS_PATH")
		if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
		NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/node.exe")

		REQUIRE_GPU = False