From 6cb656059d47d12acd023efa8314391b437cad42 Mon Sep 17 00:00:00 2001 From: switchpiggy Date: Thu, 20 Apr 2023 22:49:35 -0700 Subject: [PATCH] Fixed bug where test-wpt was unable to run on windows due to servowpt.py not correctly setting default binary path --- python/wpt/run.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python/wpt/run.py b/python/wpt/run.py index 5a75eee2c7a..e3fd3681790 100644 --- a/python/wpt/run.py +++ b/python/wpt/run.py @@ -80,11 +80,12 @@ def run_tests(**kwargs): target_dir = os.path.join(os.environ["CARGO_TARGET_DIR"]) else: target_dir = os.path.join(SERVO_ROOT, "target") + + binary_name = ("servo.exe" if sys.platform == "win32" else "servo") + default_binary_path = os.path.join( - target_dir, determine_build_type(kwargs, target_dir), "servo" + target_dir, determine_build_type(kwargs, target_dir), binary_name ) - if sys.platform == "win32": - target_dir += ".exe" set_if_none(kwargs, "binary", default_binary_path) set_if_none(kwargs, "webdriver_binary", default_binary_path)