diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 0d3a4fbe174..575cf841e5b 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -354,9 +354,8 @@ def windows_unit(cached=True): "mach build --dev", - # https://github.com/servo/servo/issues/25961 - #"mach test-unit", - #"mach smoketest --angle", + "mach test-unit", + "mach smoketest --angle", "mach package --dev", "mach build --dev --libsimpleservo", diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 7233114af67..6567136c515 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -675,11 +675,12 @@ class MachCommands(CommandBase): if not dev and not libsimpleservo: call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")], 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"]: - shutil.copy(path.join(env['OPENSSL_LIB_DIR'], "../bin", ssl_lib), - servo_exe_dir) - # Search for the generated nspr4.dll + ssl_path = path.join(env['OPENSSL_LIB_DIR'], "../bin", ssl_lib) + shutil.copy(ssl_path, servo_exe_dir) + shutil.copy(ssl_path, path.join(servo_exe_dir, "deps")) + build_path = path.join(servo_exe_dir, "build") assert os.path.exists(build_path)