From a471704107b244b7d99ab416a0336c81f8908fff Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 14 Apr 2015 12:01:13 +0200 Subject: [PATCH] Introduce a Servo-only tree under web-platform-tests. --- tests/content/test_prototypes.html | 25 ------------------ tests/wpt/README.md | 9 +++++++ tests/wpt/config.ini | 5 ++++ tests/wpt/include.ini | 2 ++ tests/wpt/mozilla/meta/MANIFEST.json | 23 ++++++++++++++++ .../wpt/mozilla/tests/mozilla/prototypes.html | 26 +++++++++++++++++++ 6 files changed, 65 insertions(+), 25 deletions(-) delete mode 100644 tests/content/test_prototypes.html create mode 100644 tests/wpt/mozilla/meta/MANIFEST.json create mode 100644 tests/wpt/mozilla/tests/mozilla/prototypes.html diff --git a/tests/content/test_prototypes.html b/tests/content/test_prototypes.html deleted file mode 100644 index 705cff1d8dd..00000000000 --- a/tests/content/test_prototypes.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - foo - - - diff --git a/tests/wpt/README.md b/tests/wpt/README.md index 38bc02a4064..2d3a959f36f 100644 --- a/tests/wpt/README.md +++ b/tests/wpt/README.md @@ -17,6 +17,7 @@ In particular, this folder contains: * `metadata`: expected failures for the web-platform-tests we run. * `css-tests`: copy of the built CSSWG tests. * `metadata-css`: expected failures for the CSSWG tests we run. +* `mozilla`: web-platform-tests that cannot be upstreamed. Running the tests ================= @@ -125,3 +126,11 @@ The easiest way to update the test harness is using git: cd ../../.. At this point you should commit the updated files in the *servo* git repository. + +Servo-specific tests +==================== + +The `mozilla` directory contains tests that cannot be upstreamed for some +reason (e.g. because they depend on Servo-specific APIs), as well as some +legacy tests that should be upstreamed at some point. When run they are +mounted on the server under `/_mozilla/`. diff --git a/tests/wpt/config.ini b/tests/wpt/config.ini index 860912add32..3dec291038a 100644 --- a/tests/wpt/config.ini +++ b/tests/wpt/config.ini @@ -13,3 +13,8 @@ run-info = . tests = web-platform-tests metadata = metadata url-base = / + +[manifest:mozilla] +tests = mozilla/tests +metadata = mozilla/meta +url_base = /_mozilla/ diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini index 6307f5538cf..bdbdc97fd6e 100644 --- a/tests/wpt/include.ini +++ b/tests/wpt/include.ini @@ -97,3 +97,5 @@ skip: true skip: false [encoding] skip: false +[_mozilla] + skip: false diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json new file mode 100644 index 00000000000..506e7b62b7d --- /dev/null +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -0,0 +1,23 @@ +{ + "items": { + "manual": [], + "reftest": [], + "stub": [], + "testharness": [ + { + "path": "mozilla/prototypes.html", + "url": "/_mozilla/mozilla/prototypes.html" + } + ], + "wdspec": [] + }, + "local_changes": { + "deleted": [], + "items": {}, + "reftest_nodes": {} + }, + "reftest_nodes": {}, + "rev": null, + "url_base": "/_mozilla/", + "version": 2 +} diff --git a/tests/wpt/mozilla/tests/mozilla/prototypes.html b/tests/wpt/mozilla/tests/mozilla/prototypes.html new file mode 100644 index 00000000000..b509b46192e --- /dev/null +++ b/tests/wpt/mozilla/tests/mozilla/prototypes.html @@ -0,0 +1,26 @@ + + + + + + + + foo + + +