diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2023-06-24 09:22:18 +0200 |
|---|---|---|
| committer | Martin Robinson <mrobinson@igalia.com> | 2023-06-26 10:48:02 +0200 |
| commit | f017169ae482effc446384050e79b752bd9ddfe5 (patch) | |
| tree | 90bc38a792825b615100f112e14838523ccb7577 /python/wpt | |
| parent | 234d50723463159400ee4bf25fa130011e9f72ef (diff) | |
| download | servo-f017169ae482effc446384050e79b752bd9ddfe5.tar.gz servo-f017169ae482effc446384050e79b752bd9ddfe5.zip | |
Update scripts to reflect new WPT directory name
Diffstat (limited to 'python/wpt')
13 files changed, 19 insertions, 19 deletions
diff --git a/python/wpt/__init__.py b/python/wpt/__init__.py index a8276a506ce..c816a605e73 100644 --- a/python/wpt/__init__.py +++ b/python/wpt/__init__.py @@ -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) diff --git a/python/wpt/exporter/common.py b/python/wpt/exporter/common.py index 307edce0276..7f2393ac0dc 100644 --- a/python/wpt/exporter/common.py +++ b/python/wpt/exporter/common.py @@ -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 = ( diff --git a/python/wpt/manifestupdate.py b/python/wpt/manifestupdate.py index 05d380139db..b382624c7f2 100644 --- a/python/wpt/manifestupdate.py +++ b/python/wpt/manifestupdate.py @@ -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} diff --git a/python/wpt/tests/18746.diff b/python/wpt/tests/18746.diff index ad6150c1bdb..61997053969 100644 --- a/python/wpt/tests/18746.diff +++ b/python/wpt/tests/18746.diff @@ -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> diff --git a/python/wpt/tests/add-non-utf8-file.diff b/python/wpt/tests/add-non-utf8-file.diff index bd3b755d87d..5a6a684924d 100644 --- a/python/wpt/tests/add-non-utf8-file.diff +++ b/python/wpt/tests/add-non-utf8-file.diff @@ -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 � " diff --git a/python/wpt/tests/does-not-apply-cleanly.diff b/python/wpt/tests/does-not-apply-cleanly.diff index aa49c3bafbe..904b4ed859d 100644 --- a/python/wpt/tests/does-not-apply-cleanly.diff +++ b/python/wpt/tests/does-not-apply-cleanly.diff @@ -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> diff --git a/python/wpt/tests/move-into-wpt.diff b/python/wpt/tests/move-into-wpt.diff index 02c437cdd7b..4e5656fc0f9 100644 --- a/python/wpt/tests/move-into-wpt.diff +++ b/python/wpt/tests/move-into-wpt.diff @@ -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 diff --git a/python/wpt/tests/move-out-of-wpt.diff b/python/wpt/tests/move-out-of-wpt.diff index f81541363ec..0b0d834c437 100644 --- a/python/wpt/tests/move-out-of-wpt.diff +++ b/python/wpt/tests/move-out-of-wpt.diff @@ -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 diff --git a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/css/css-test.html b/python/wpt/tests/servo-mock/tests/wpt/tests/css/css-test.html index cffb6eb6b5a..cffb6eb6b5a 100644 --- a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/css/css-test.html +++ b/python/wpt/tests/servo-mock/tests/wpt/tests/css/css-test.html diff --git a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/css/out-of-sync-test.html b/python/wpt/tests/servo-mock/tests/wpt/tests/css/out-of-sync-test.html index cffb6eb6b5a..cffb6eb6b5a 100644 --- a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/css/out-of-sync-test.html +++ b/python/wpt/tests/servo-mock/tests/wpt/tests/css/out-of-sync-test.html diff --git a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html b/python/wpt/tests/servo-mock/tests/wpt/tests/fetch/api/redirect/redirect-location.html index 48a68cd53ce..48a68cd53ce 100644 --- a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html +++ b/python/wpt/tests/servo-mock/tests/wpt/tests/fetch/api/redirect/redirect-location.html diff --git a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/test.html b/python/wpt/tests/servo-mock/tests/wpt/tests/test.html index 43b09d4e57d..43b09d4e57d 100644 --- a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/test.html +++ b/python/wpt/tests/servo-mock/tests/wpt/tests/test.html diff --git a/python/wpt/tests/wpt.diff b/python/wpt/tests/wpt.diff index 37781cf488e..5bbbd74ee5e 100644 --- a/python/wpt/tests/wpt.diff +++ b/python/wpt/tests/wpt.diff @@ -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> |