From e64aa7da7a8569a0d3f0f96f6ded304ff2126d5e Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Tue, 13 Feb 2024 12:37:26 -0700 Subject: [PATCH] Tests: Add patch to WPT to let our metadata update script work again --- ...ct-name-to-update-metadata-fallback-.patch | 22 +++++++++++++++++++ Tests/LibWeb/WPT/run.sh | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 Tests/LibWeb/WPT/0001-tools-Pass-product-name-to-update-metadata-fallback-.patch diff --git a/Tests/LibWeb/WPT/0001-tools-Pass-product-name-to-update-metadata-fallback-.patch b/Tests/LibWeb/WPT/0001-tools-Pass-product-name-to-update-metadata-fallback-.patch new file mode 100644 index 0000000000..4d8e4c2286 --- /dev/null +++ b/Tests/LibWeb/WPT/0001-tools-Pass-product-name-to-update-metadata-fallback-.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Andrew Kaster +Date: Tue, 13 Feb 2024 12:31:25 -0700 +Subject: [PATCH] tools: Pass product name to update-metadata fallback path + +--- + tools/wpt/update.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/wpt/update.py b/tools/wpt/update.py +index 4dba7e69df8376e7e8566525ab083e6e0348a92f..17cd74e37fd79b839167feedc105ce986e89322e 100644 +--- a/tools/wpt/update.py ++++ b/tools/wpt/update.py +@@ -44,7 +44,7 @@ def update_expectations(_, **kwargs): + update_properties = metadata.get_properties(properties_file=kwargs["properties_file"], + extra_properties=kwargs["extra_property"], + config=kwargs["config"], +- product=kwargs["product"]) ++ product=kwargs["product"].name) + + manifest_update(kwargs["test_paths"]) + metadata.update_expected(kwargs["test_paths"], diff --git a/Tests/LibWeb/WPT/run.sh b/Tests/LibWeb/WPT/run.sh index 89306ae065..a82d1f7e18 100755 --- a/Tests/LibWeb/WPT/run.sh +++ b/Tests/LibWeb/WPT/run.sh @@ -46,6 +46,8 @@ if [ ! -d "${SCRIPT_DIR}/wpt" ]; then # Switch to the commit that was used to generate tests expectations. Requires periodic updates. git -C wpt checkout eedf737ce39c512d0ca3471f988972e3ece11822 + git apply 0001-tools-Pass-product-name-to-update-metadata-fallback-.patch + # Update hosts file if needed if [ "$(comm -13 <(sort -u /etc/hosts) <(python3 ./wpt/wpt make-hosts-file | sort -u) | wc -l)" -gt 0 ]; then echo "Enter superuser password to append wpt hosts to /etc/hosts"