Set up PATH to find DLLs for tests

This commit is contained in:
Vladimir Vukicevic 2016-08-16 20:47:56 -04:00
parent ab007315c2
commit a25c3da27a

View file

@ -221,7 +221,11 @@ class MachCommands(CommandBase):
env["RUST_BACKTRACE"] = "1" env["RUST_BACKTRACE"] = "1"
if sys.platform in ("win32", "msys"): if sys.platform in ("win32", "msys"):
if "msvc" not in host_triple(): if "msvc" in host_triple():
# on MSVC, we need some DLLs in the path. They were copied
# in to the servo.exe build dir, so just point PATH to that.
env["PATH"] = "%s%s%s" % (path.dirname(self.get_binary_path(False, False)), os.pathsep, env["PATH"])
else:
env["RUSTFLAGS"] = "-C link-args=-Wl,--subsystem,windows" env["RUSTFLAGS"] = "-C link-args=-Wl,--subsystem,windows"
result = call(args, env=env, cwd=self.servo_crate()) result = call(args, env=env, cwd=self.servo_crate())