aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/testing_commands.py
diff options
context:
space:
mode:
authorVladimir Vukicevic <vladimir@pobox.com>2016-08-16 20:47:56 -0400
committerVladimir Vukicevic <vladimir@pobox.com>2016-08-17 09:51:45 -0400
commita25c3da27aefebc468c24b5414852805f365b917 (patch)
tree4582494bd27d4f57ebfe98fc76d2548148b6b63c /python/servo/testing_commands.py
parentab007315c20f8f9ec43ad40743e803b1ec490bf6 (diff)
downloadservo-a25c3da27aefebc468c24b5414852805f365b917.tar.gz
servo-a25c3da27aefebc468c24b5414852805f365b917.zip
Set up PATH to find DLLs for tests
Diffstat (limited to 'python/servo/testing_commands.py')
-rw-r--r--python/servo/testing_commands.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index f5b87c228f0..ffc2dd3869e 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -221,7 +221,11 @@ class MachCommands(CommandBase):
env["RUST_BACKTRACE"] = "1"
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"
result = call(args, env=env, cwd=self.servo_crate())