Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 63ea0e274356 (bug 1683110) on suspicion of causing Android Jittests to fail with exception

Browse Source
This commit is contained in:
Sebastian Hengst 2021-01-28 19:07:40 +01:00
parent bbdb4f3b7b
commit 316d0eefad
5 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
taskcluster/ci/test/compiled.yml
View File

@ -30,7 +30,6 @@ job-defaults:
- unittests/mac_unittest.py
windows.*:
- unittests/win_unittest.py
python-3: true
cppunit:
description: "CPP Unit Tests"

6
testing/mozharness/configs/raptor/windows_config.py
View File

@ -11,15 +11,11 @@ PYTHON = sys.executable
PYTHON_DLL = "c:/mozilla-build/python27/python27.dll"
VENV_PATH = os.path.join(os.getcwd(), "build/venv")
PYWIN32 = "pypiwin32==219"
if sys.version_info > (3, 0):
PYWIN32 = "pywin32==300"
config = {
"log_name": "raptor",
"installer_path": "installer.exe",
"virtualenv_path": VENV_PATH,
"virtualenv_modules": [PYWIN32, "raptor", "mozinstall"],
"virtualenv_modules": ["pypiwin32==219", "raptor", "mozinstall"],
"exes": {
"python": PYTHON,
"easy_install": [

6
testing/mozharness/configs/raptor/windows_vm_config.py
View File

@ -11,15 +11,11 @@ PYTHON = sys.executable
PYTHON_DLL = "c:/mozilla-build/python27/python27.dll"
VENV_PATH = os.path.join(os.getcwd(), "build/venv")
PYWIN32 = "pypiwin32==219"
if sys.version_info > (3, 0):
PYWIN32 = "pywin32==300"
config = {
"log_name": "raptor",
"installer_path": "installer.exe",
"virtualenv_path": VENV_PATH,
"virtualenv_modules": [PYWIN32, "raptor", "mozinstall"],
"virtualenv_modules": ["pypiwin32==219", "raptor", "mozinstall"],
"exes": {
"python": PYTHON,
"easy_install": [

6
testing/mozharness/configs/unittests/win_unittest.py
View File

@ -15,10 +15,6 @@ NODEJS_PATH = None
if "MOZ_FETCHES_DIR" in os.environ:
NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/node.exe")
PYWIN32 = "pypiwin32==219"
if sys.version_info > (3, 0):
PYWIN32 = "pywin32==300"
XPCSHELL_NAME = "xpcshell.exe"
EXE_SUFFIX = ".exe"
DISABLE_SCREEN_SAVER = False
@ -43,7 +39,7 @@ config = {
"installer_path": INSTALLER_PATH,
"binary_path": BINARY_PATH,
"xpcshell_name": XPCSHELL_NAME,
"virtualenv_modules": [PYWIN32, "six==1.13.0", "vcversioner==2.16.0.0"],
"virtualenv_modules": ["pypiwin32==219", "six==1.13.0", "vcversioner==2.16.0.0"],
"virtualenv_path": "venv",
"exe_suffix": EXE_SUFFIX,
"run_file_names": {

2
testing/remotecppunittests.py
View File

@ -64,7 +64,7 @@ class RemoteCPPUnitTests(cppunittests.CPPUnitTests):
)
apk_contents.extract(info, tmpdir)
local_file = os.path.join(tmpdir, info.filename)
with open(local_file, "rb") as f:
with open(local_file) as f:
# Decompress xz-compressed file.
if f.read(5)[1:] == "7zXZ":
cmd = ["xz", "-df", "--suffix", ".so", local_file]