aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-04-07 12:18:17 -0400
committerGitHub <noreply@github.com>2019-04-07 12:18:17 -0400
commit8073e9a50535647c1bffe8de1c9bcf3236cf5fbb (patch)
treed611a53b51b6f6cf476b94a3882ec9ff586e389d
parent1a21c047ffa0ebf5ffc23f02f26e5ac6e8bbf2f0 (diff)
parent9d48ca12989b7af429bf9e4e0154bfbd1eb63195 (diff)
downloadservo-8073e9a50535647c1bffe8de1c9bcf3236cf5fbb.tar.gz
servo-8073e9a50535647c1bffe8de1c9bcf3236cf5fbb.zip
Auto merge of #23174 - soniasingla:DefaultPaths, r=jdm
Add default paths for WPT tests Set the following default configs for WPT tests. ```--ca-cert-path=tests\wpt\web-platform-tests\tools\certs\cacert.pem --host-key-path=tests\wpt\web-platform-tests\tools\certs\web-platform.test.key --host-cert-path=tests\wpt\web-platform-tests\tools\certs\web-platform.test.pem --ssl-type=pregenerated ``` <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #23133 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23174) <!-- Reviewable:end -->
-rw-r--r--tests/wpt/run.py17
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/wpt/run.py b/tests/wpt/run.py
index ae4d9079e56..6b012d0f5d3 100644
--- a/tests/wpt/run.py
+++ b/tests/wpt/run.py
@@ -20,7 +20,10 @@ def servo_path(*args):
return os.path.join(servo_root, *args)
paths = {"include_manifest": wpt_path("include.ini"),
- "config": wpt_path("config.ini")}
+ "config": wpt_path("config.ini"),
+ "ca-cert-path": wpt_path("web-platform-tests/tools/certs/cacert.pem"),
+ "host-key-path": wpt_path("web-platform-tests/tools/certs/web-platform.test.key"),
+ "host-cert-path": wpt_path("web-platform-tests/tools/certs/web-platform.test.pem")}
# Imports
sys.path.append(wpt_path("web-platform-tests", "tools"))
import localpaths # noqa: flake8
@@ -74,6 +77,18 @@ def set_defaults(kwargs):
if kwargs["processes"] is None:
kwargs["processes"] = multiprocessing.cpu_count()
+ if kwargs["ca_cert_path"] is None:
+ kwargs["ca_cert_path"] = paths["ca-cert-path"]
+
+ if kwargs["host_key_path"] is None:
+ kwargs["host_key_path"] = paths["host-key-path"]
+
+ if kwargs["host_cert_path"] is None:
+ kwargs["host_cert_path"] = paths["host-cert-path"]
+
+ if kwargs["ssl_type"] is None:
+ kwargs["ssl_type"] = "pregenerated"
+
kwargs["user_stylesheets"].append(servo_path("resources", "ahem.css"))
wptcommandline.check_args(kwargs)