BB 43243: Modify mozharness scripts for Base Browser (b73089dd) · Commits · The Tor Project / Applications / Tor Browser

testing/mozharness/configs/android/android14-x86_64.py

+3 −2

Original line number	Diff line number	Diff line
		@@ -11,8 +11,9 @@ config = {
		"emulator_avd_name": "mozemulator-android34-x86_64",
		"emulator_process_name": "qemu-system-x86_64",
		"emulator_extra_args": [
		"-gpu",
		"on",
		"-no-window",
		"-no-audio",
		"-no-boot-anim",
		"-skip-adb-auth",
		"-verbose",
		"-show-kernel",

testing/mozharness/configs/android/android_common.py

+15 −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")


		@@ -310,6 +310,19 @@ config = {
		"--deviceSerial=%(device_serial)s",
		],
		},
		"marionette": {
		"run_filename": "runtests.py",
		"testsdir": "marionette/harness/marionette_harness",
		"install": True,
		"options": [
		"-vv",
		"--address=127.0.0.1:2828",
		"--app=fennec",
		],
		"tests": [
		"%(abs_marionette_manifest_dir)s/unit-tests.toml",
		],
		},
		}, # end suite_definitions
		"unstructured_suites": [
		"jittest",

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

+4 −42

Original line number	Diff line number	Diff line
		@@ -3,12 +3,11 @@
		# file, You can obtain one at http://mozilla.org/MPL/2.0/.

		import os
		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"
		@@ -202,45 +201,8 @@ config = {
		"halt_on_failure": True,
		"enabled": True,
		},
		{
		"name": "kill_dock",
		"cmd": ["killall", "Dock"],
		"architectures": ["64bit"],
		"halt_on_failure": True,
		"enabled": True,
		},
		{
		"name": "verify refresh rate",
		"cmd": [
		sys.executable,
		os.path.join(
		os.getcwd(),
		"mozharness",
		"external_tools",
		"macosx_resolution_refreshrate.py",
		),
		"--check=refresh-rate",
		],
		"architectures": ["64bit"],
		"halt_on_failure": True,
		"enabled": True,
		},
		{
		"name": "verify screen resolution",
		"cmd": [
		sys.executable,
		os.path.join(
		os.getcwd(),
		"mozharness",
		"external_tools",
		"macosx_resolution_refreshrate.py",
		),
		"--check=resolution",
		],
		"architectures": ["64bit"],
		"halt_on_failure": True,
		"enabled": True,
		},
		# tor-browser-bundle-testsuite#40107: Skip environment configurations
		# from upstream that are unnecessary in our CI setup.
		],
		"vcs_output_timeout": 1000,
		"minidump_save_path": "%(abs_work_dir)s/../minidumps",

testing/mozharness/configs/unittests/win_unittest.py

+6 −36

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
		@@ -22,7 +22,7 @@ USE_HARDWARE = False
		if "USE_HARDWARE" in os.environ:
		USE_HARDWARE = os.environ["USE_HARDWARE"] == "1"

		PYWIN32 = "pywin32==306"
		PYWIN32 = "pywin32==312"

		XPCSHELL_NAME = "xpcshell.exe"
		EXE_SUFFIX = ".exe"
		@@ -222,38 +222,8 @@ config = {
		"halt_on_failure": False,
		"enabled": DISABLE_SCREEN_SAVER,
		},
		{
		"name": "run mouse & screen adjustment script",
		"cmd": [
		sys.executable,
		os.path.join(
		os.getcwd(),
		"mozharness",
		"external_tools",
		"mouse_and_screen_resolution.py",
		),
		"--configuration-file",
		os.path.join(
		os.getcwd(),
		"mozharness",
		"external_tools",
		"machine-configuration.json",
		),
		(
		"--platform=win10-vm"
		if REQUIRE_GPU and (platform.uname().version == "10.0.19045")
		else (
		"--platform=win11-hw"
		if REQUIRE_GPU
		and platform.uname().version in ("10.0.26100", "10.0.26200")
		else "--platform=win7"
		)
		),
		],
		"architectures": ["32bit", "64bit"],
		"halt_on_failure": True,
		"enabled": ADJUST_MOUSE_AND_SCREEN,
		},
		# tor-browser-bundle-testsuite#40107: Skip environment configurations
		# from upstream that are unnecessary in our CI setup.
		{
		"name": "enable microphone access for msix",
		"cmd": [