mirror of
https://github.com/servo/servo.git
synced 2025-08-01 19:50:30 +01:00
Update scripts to reflect new WPT directory name
This commit is contained in:
parent
234d507234
commit
f017169ae4
21 changed files with 39 additions and 45 deletions
|
@ -136,20 +136,14 @@ def wpt_path(is_firefox, topdir, *paths):
|
|||
|
||||
def wptrunner_path(is_firefox, topdir, *paths):
|
||||
wpt_root = wpt_path(is_firefox, topdir)
|
||||
if is_firefox:
|
||||
rel = os.path.join(wpt_root, "tests", "tools", "wptrunner")
|
||||
else:
|
||||
rel = os.path.join(wpt_root, "web-platform-tests", "tools", "wptrunner")
|
||||
rel = os.path.join(wpt_root, "tests", "tools", "wptrunner")
|
||||
|
||||
return os.path.join(topdir, rel, *paths)
|
||||
|
||||
|
||||
def wptserve_path(is_firefox, topdir, *paths):
|
||||
wpt_root = wpt_path(is_firefox, topdir)
|
||||
if is_firefox:
|
||||
rel = os.path.join(wpt_root, "tests", "tools", "wptserve")
|
||||
else:
|
||||
rel = os.path.join(wpt_root, "web-platform-tests", "tools", "wptserve")
|
||||
rel = os.path.join(wpt_root, "tests", "tools", "wptserve")
|
||||
|
||||
return os.path.join(topdir, rel, *paths)
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ from distutils.dir_util import copy_tree
|
|||
|
||||
SCRIPT_PATH = os.path.split(__file__)[0]
|
||||
PROJECT_TOPLEVEL_PATH = os.path.abspath(os.path.join(SCRIPT_PATH, "..", ".."))
|
||||
WEB_PLATFORM_TESTS_PATH = os.path.join("tests", "wpt", "web-platform-tests")
|
||||
WEB_PLATFORM_TESTS_PATH = os.path.join("tests", "wpt", "tests")
|
||||
SERVO_TESTS_PATH = os.path.join("tests", "wpt", "mozilla", "tests")
|
||||
|
||||
CLANGFMT_CPP_DIRS = ["support/hololens/"]
|
||||
|
@ -711,14 +711,14 @@ class WebPlatformTestsCreator(CommandBase):
|
|||
|
||||
if test_url is None:
|
||||
print("""Test path %s is not in wpt directories:
|
||||
tests/wpt/web-platform-tests for tests that may be shared
|
||||
tests/wpt/tests for tests that may be shared
|
||||
tests/wpt/mozilla/tests for Servo-only tests""" % test_path)
|
||||
return 1
|
||||
|
||||
if reference_url is None:
|
||||
print("""Reference path %s is not in wpt directories:
|
||||
testing/web-platform/tests for tests that may be shared
|
||||
testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path)
|
||||
tests/wpt/tests for tests that may be shared
|
||||
tests/wpt/mozilla/tests for Servo-only tests""" % reference_path)
|
||||
return 1
|
||||
|
||||
if os.path.exists(test_path) and not kwargs["overwrite"]:
|
||||
|
|
|
@ -25,7 +25,7 @@ from .licenseck import OLD_MPL, MPL, APACHE, COPYRIGHT, licenses_toml, licenses_
|
|||
|
||||
TOPDIR = os.path.abspath(os.path.dirname(sys.argv[0]))
|
||||
WPT_PATH = os.path.join(".", "tests", "wpt")
|
||||
SUITES = ["web-platform-tests", os.path.join("mozilla", "tests")]
|
||||
SUITES = ["tests", os.path.join("mozilla", "tests")]
|
||||
|
||||
|
||||
def wpt_path(*args):
|
||||
|
@ -40,7 +40,7 @@ URL_REGEX = re.compile(br'https?://(?:[-\w.]|(?:%[\da-fA-F]{2}))+')
|
|||
# Import wptmanifest only when we do have wpt in tree, i.e. we're not
|
||||
# inside a Firefox checkout.
|
||||
if os.path.isfile(WPT_MANIFEST_PATH):
|
||||
sys.path.append(wpt_path("web-platform-tests", "tools", "wptrunner", "wptrunner"))
|
||||
sys.path.append(wpt_path("tests", "tools", "wptrunner", "wptrunner"))
|
||||
from wptmanifest import parser, node
|
||||
|
||||
# Default configs
|
||||
|
@ -506,7 +506,7 @@ def check_manifest_dirs(config_file, print_text=True):
|
|||
print('\rChecking the wpt manifest file...')
|
||||
|
||||
p = parser.parse(lines)
|
||||
paths = rec_parse(wpt_path("web-platform-tests"), p)
|
||||
paths = rec_parse(wpt_path("tests"), p)
|
||||
for idx, path in enumerate(paths):
|
||||
if '_mozilla' in path or '_webgl' in path or '_webgpu' in path:
|
||||
continue
|
||||
|
@ -1152,7 +1152,7 @@ class WPTLint(LintRunner):
|
|||
if self.stylo or self.no_wpt:
|
||||
return
|
||||
|
||||
wpt_working_dir = os.path.abspath(os.path.join(WPT_PATH, "web-platform-tests"))
|
||||
wpt_working_dir = os.path.abspath(os.path.join(WPT_PATH, "tests"))
|
||||
for suite in SUITES:
|
||||
files = list(self._get_wpt_files(suite))
|
||||
if not files:
|
||||
|
|
|
@ -15,7 +15,7 @@ import mozlog.commandline
|
|||
SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__))
|
||||
SERVO_ROOT = os.path.abspath(os.path.join(SCRIPT_PATH, "..", ".."))
|
||||
WPT_PATH = os.path.join(SERVO_ROOT, "tests", "wpt")
|
||||
WPT_TOOLS_PATH = os.path.join(WPT_PATH, "web-platform-tests", "tools")
|
||||
WPT_TOOLS_PATH = os.path.join(WPT_PATH, "tests", "tools")
|
||||
CERTS_PATH = os.path.join(WPT_TOOLS_PATH, "certs")
|
||||
|
||||
sys.path.insert(0, WPT_TOOLS_PATH)
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
# pylint: disable=missing-docstring
|
||||
|
||||
UPSTREAMABLE_PATH = "tests/wpt/web-platform-tests/"
|
||||
UPSTREAMABLE_PATH = "tests/wpt/tests/"
|
||||
NO_SYNC_SIGNAL = "[no-wpt-sync]"
|
||||
|
||||
OPENED_NEW_UPSTREAM_PR = (
|
||||
|
|
|
@ -34,7 +34,7 @@ def create_parser():
|
|||
def update(check_clean=True, rebuild=False, **kwargs):
|
||||
logger = wptlogging.setup(kwargs, {"mach": sys.stdout})
|
||||
kwargs = {"config": os.path.join(WPT_PATH, "config.ini"),
|
||||
"manifest_path": os.path.join(WPT_PATH, "metadata"),
|
||||
"manifest_path": os.path.join(WPT_PATH, "meta"),
|
||||
"tests_root": None,
|
||||
"metadata_root": None}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html
|
||||
diff --git a/tests/wpt/tests/fetch/api/redirect/redirect-location.html b/tests/wpt/tests/fetch/api/redirect/redirect-location.html
|
||||
index ac35dea54c47..135ad21d15ab 100644
|
||||
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html
|
||||
+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html
|
||||
--- a/tests/wpt/tests/fetch/api/redirect/redirect-location.html
|
||||
+++ b/tests/wpt/tests/fetch/api/redirect/redirect-location.html
|
||||
@@ -13,4 +13,5 @@
|
||||
<script src="redirect-location.js"></script>
|
||||
</body>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/tests/wpt/web-platform-tests/non-utf8-file.txt b/tests/wpt/web-platform-tests/non-utf8-file.txt
|
||||
diff --git a/tests/wpt/tests/non-utf8-file.txt b/tests/wpt/tests/non-utf8-file.txt
|
||||
new file mode 100644
|
||||
index 0000000..5a992e0
|
||||
--- /dev/null
|
||||
+++ b/tests/wpt/web-platform-tests/non-utf8-file.txt
|
||||
+++ b/tests/wpt/tests/non-utf8-file.txt
|
||||
@@ -0,0 +1 @@
|
||||
+foo bér ÿ "
|
||||
+foo bér <20> "
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/tests/wpt/web-platform-tests/css/css-test.html b/tests/wpt/web-platform-tests/css/css-test.html
|
||||
diff --git a/tests/wpt/tests/css/css-test.html b/tests/wpt/tests/css/css-test.html
|
||||
index cffb6eb..6100a49 100644
|
||||
--- a/tests/wpt/web-platform-tests/css/out-of-sync-test.html
|
||||
+++ b/tests/wpt/web-platform-tests/css/out-of-sync-test.html
|
||||
--- a/tests/wpt/tests/css/out-of-sync-test.html
|
||||
+++ b/tests/wpt/tests/css/out-of-sync-test.html
|
||||
@@ -1,3 +1,3 @@
|
||||
<html>
|
||||
-<h1>css test!</h1>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
diff --git a/tests/wpt/mozilla/tests/mozilla/mozilla-test.html b/tests/wpt/web-platform-tests/mozilla-test.html
|
||||
diff --git a/tests/wpt/mozilla/tests/mozilla/mozilla-test.html b/tests/wpt/tests/mozilla-test.html
|
||||
similarity index 100%
|
||||
rename from tests/wpt/mozilla/tests/mozilla/mozilla-test.html
|
||||
rename to tests/wpt/web-platform-tests/mozilla-test.html
|
||||
rename to tests/wpt/tests/mozilla-test.html
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
diff --git a/tests/wpt/web-platform-tests/test.html b/tests/wpt/test.html
|
||||
diff --git a/tests/wpt/tests/test.html b/tests/wpt/test.html
|
||||
similarity index 100%
|
||||
rename from tests/wpt/web-platform-tests/test.html
|
||||
rename from tests/wpt/tests/test.html
|
||||
rename to tests/wpt/test.html
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/tests/wpt/web-platform-tests/css/css-test.html b/tests/wpt/web-platform-tests/css/css-test.html
|
||||
diff --git a/tests/wpt/tests/css/css-test.html b/tests/wpt/tests/css/css-test.html
|
||||
index cffb6eb..6100a49 100644
|
||||
--- a/tests/wpt/web-platform-tests/css/css-test.html
|
||||
+++ b/tests/wpt/web-platform-tests/css/css-test.html
|
||||
--- a/tests/wpt/tests/css/css-test.html
|
||||
+++ b/tests/wpt/tests/css/css-test.html
|
||||
@@ -1,3 +1,3 @@
|
||||
<html>
|
||||
-<h1>css test!</h1>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue