diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-31 01:34:02 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-31 01:34:02 -0600 |
| commit | d46e4a6c4a68ebc87be4b1a7a5fcc5ffbee3c2ab (patch) | |
| tree | a79e66bbe74efed0dcecf9e40de16754e06dc2d3 | |
| parent | 7dda183022f9bee8b4bdffe8b4cf31e09b885d94 (diff) | |
| parent | 14e55e30825703d40417a41c9a4d570a3b25ff0e (diff) | |
| download | servo-d46e4a6c4a68ebc87be4b1a7a5fcc5ffbee3c2ab.tar.gz servo-d46e4a6c4a68ebc87be4b1a7a5fcc5ffbee3c2ab.zip | |
Auto merge of #7454 - Ms2ger:worker-tests, r=nox
Disable workers tests in __dir__.ini rather than include.ini.
This ensures those tests are skipped when running ./mach test-wpt workers.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7454)
<!-- Reviewable:end -->
6 files changed, 11 insertions, 12 deletions
diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini index cbd4f34dbf1..1c00f118a49 100644 --- a/tests/wpt/include.ini +++ b/tests/wpt/include.ini @@ -73,18 +73,6 @@ skip: true skip: false [workers] skip: false - [constructors] - skip: false - [SharedWorker] - skip: true - [semantics] - skip: false - [navigation] - skip: true - [reporting-errors] - skip: true - [structured-clone] - skip: true [XMLHttpRequest] skip: false [old-tests] diff --git a/tests/wpt/metadata/workers/constructors/SharedWorker/__dir__.ini b/tests/wpt/metadata/workers/constructors/SharedWorker/__dir__.ini new file mode 100644 index 00000000000..168df4e0769 --- /dev/null +++ b/tests/wpt/metadata/workers/constructors/SharedWorker/__dir__.ini @@ -0,0 +1 @@ +disabled: SharedWorker diff --git a/tests/wpt/metadata/workers/semantics/navigation/001.html.ini b/tests/wpt/metadata/workers/semantics/navigation/001.html.ini new file mode 100644 index 00000000000..b3538369e2e --- /dev/null +++ b/tests/wpt/metadata/workers/semantics/navigation/001.html.ini @@ -0,0 +1,3 @@ +[001.html] + type: testharness + expected: TIMEOUT diff --git a/tests/wpt/metadata/workers/semantics/navigation/002.html.ini b/tests/wpt/metadata/workers/semantics/navigation/002.html.ini new file mode 100644 index 00000000000..23e8bb1452d --- /dev/null +++ b/tests/wpt/metadata/workers/semantics/navigation/002.html.ini @@ -0,0 +1,5 @@ +[002.html] + type: testharness + [navigating 2] + expected: FAIL + diff --git a/tests/wpt/metadata/workers/semantics/reporting-errors/__dir__.ini b/tests/wpt/metadata/workers/semantics/reporting-errors/__dir__.ini new file mode 100644 index 00000000000..168df4e0769 --- /dev/null +++ b/tests/wpt/metadata/workers/semantics/reporting-errors/__dir__.ini @@ -0,0 +1 @@ +disabled: SharedWorker diff --git a/tests/wpt/metadata/workers/semantics/structured-clone/__dir__.ini b/tests/wpt/metadata/workers/semantics/structured-clone/__dir__.ini new file mode 100644 index 00000000000..879844e9bd2 --- /dev/null +++ b/tests/wpt/metadata/workers/semantics/structured-clone/__dir__.ini @@ -0,0 +1 @@ +disabled: Broken somehow |