aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/run.py
diff options
context:
space:
mode:
authorAntoine Martin <antoine97.martin@gmail.com>2020-07-03 20:47:22 +0200
committerAntoine Martin <antoine97.martin@gmail.com>2020-07-04 01:01:25 +0200
commit9f224c41f74588ea45fae04ef21f171b54bc346d (patch)
tree0e8c83ba3311b194f89c3f46ee39e321f6c9f184 /tests/wpt/run.py
parent4d60fd8ea9cb58166f9684e177404260b0401517 (diff)
downloadservo-9f224c41f74588ea45fae04ef21f171b54bc346d.tar.gz
servo-9f224c41f74588ea45fae04ef21f171b54bc346d.zip
Use CARGO_TARGET_DIR in tests
Diffstat (limited to 'tests/wpt/run.py')
-rw-r--r--tests/wpt/run.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/wpt/run.py b/tests/wpt/run.py
index 3fc43fb3f13..84048d4ea0e 100644
--- a/tests/wpt/run.py
+++ b/tests/wpt/run.py
@@ -4,6 +4,7 @@
import multiprocessing
import os
+from os import path
import sys
import mozlog
import grouping_formatter
@@ -72,7 +73,10 @@ def set_defaults(kwargs):
bin_name = "servo"
if sys.platform == "win32":
bin_name += ".exe"
- bin_path = servo_path("target", bin_dir, bin_name)
+ if "CARGO_TARGET_DIR" in os.environ:
+ bin_path = path.join(os.environ["CARGO_TARGET_DIR"], bin_dir, bin_name)
+ else:
+ bin_path = servo_path("target", bin_dir, bin_name)
kwargs["binary"] = bin_path
kwargs["webdriver_binary"] = bin_path