aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2015-08-30 16:42:04 +0200
committerMs2ger <Ms2ger@gmail.com>2015-08-31 09:12:52 +0200
commit14e55e30825703d40417a41c9a4d570a3b25ff0e (patch)
tree633beae83a9010e3afa3de53d937ef25603269c9
parent89a5e2b3d098fc2afdb95ebcebeb8d7beeebc96a (diff)
downloadservo-14e55e30825703d40417a41c9a4d570a3b25ff0e.tar.gz
servo-14e55e30825703d40417a41c9a4d570a3b25ff0e.zip
Disable workers tests in __dir__.ini rather than include.ini.
This ensures those tests are skipped when running ./mach test-wpt workers.
-rw-r--r--tests/wpt/include.ini12
-rw-r--r--tests/wpt/metadata/workers/constructors/SharedWorker/__dir__.ini1
-rw-r--r--tests/wpt/metadata/workers/semantics/navigation/001.html.ini3
-rw-r--r--tests/wpt/metadata/workers/semantics/navigation/002.html.ini5
-rw-r--r--tests/wpt/metadata/workers/semantics/reporting-errors/__dir__.ini1
-rw-r--r--tests/wpt/metadata/workers/semantics/structured-clone/__dir__.ini1
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