Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #25980 - servo:jdm-patch-44, r=paulrouget

Browse source 
Enable windows unit tests

Fixes #25961.
This commit is contained in:
bors-servo 2020-03-20 10:33:45 -04:00 • committed by GitHub
commit 7ef4c65ac3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
etc/taskcluster/decision_task.py
View file

@ -354,9 +354,8 @@ def windows_unit(cached=True):
"mach build --dev", "mach build --dev",
# https://github.com/servo/servo/issues/25961 "mach test-unit",
#"mach test-unit", "mach smoketest --angle",
#"mach smoketest --angle",
"mach package --dev", "mach package --dev",
"mach build --dev --libsimpleservo", "mach build --dev --libsimpleservo",

9
python/servo/build_commands.py
View file

@ -675,11 +675,12 @@ class MachCommands(CommandBase):
if not dev and not libsimpleservo: if not dev and not libsimpleservo:
call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")], call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")],
verbose=verbose) verbose=verbose)
# on msvc, we need to copy in some DLLs in to the servo.exe dir # on msvc, we need to copy in some DLLs in to the servo.exe dir and the directory for unit tests.
for ssl_lib in ["libssl.dll", "libcrypto.dll"]: for ssl_lib in ["libssl.dll", "libcrypto.dll"]:
shutil.copy(path.join(env['OPENSSL_LIB_DIR'], "../bin", ssl_lib), ssl_path = path.join(env['OPENSSL_LIB_DIR'], "../bin", ssl_lib)
servo_exe_dir) shutil.copy(ssl_path, servo_exe_dir)
# Search for the generated nspr4.dll shutil.copy(ssl_path, path.join(servo_exe_dir, "deps"))
build_path = path.join(servo_exe_dir, "build") build_path = path.join(servo_exe_dir, "build")
assert os.path.exists(build_path) assert os.path.exists(build_path)