Bug 939048 - Part f: Move mochitests to manifests in dom/workers; r=jst

mozilla-spidermonkey · Dec 31, 2013 · 7936766 · 7936766
1 parent b6746b2
commit 7936766
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 26 deletions.
diff --git a/dom/workers/test/Makefile.in b/dom/workers/test/Makefile.in
diff --git a/dom/workers/test/mochitest.ini b/dom/workers/test/mochitest.ini
@@ -58,6 +58,9 @@ support-files =
   url_exceptions_worker.js
   jsversion_worker.js
   urlSearchParams_worker.js
+  subdir/relativeLoad_sub_worker.js
+  subdir/relativeLoad_sub_worker2.js
+  subdir/relativeLoad_sub_import.js
 
 [test_404.html]
 [test_atob.html]
@@ -114,6 +117,8 @@ support-files =
 [test_xhr_parameters.js]
 [test_xhr_system.html]
 [test_xhr_system.js]
+[test_xhr_timeout.html]
+skip-if = (os == "win") || (os == "mac")
 [test_url_exceptions.html]
 [test_urlSearchParams.html]
 [test_jsversion.html]
diff --git a/dom/workers/test/moz.build b/dom/workers/test/moz.build
@@ -6,7 +6,6 @@
 
 DIRS += [
     'extensions',
-    'subdir',
 ]
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']

diff --git a/dom/workers/test/subdir/Makefile.in b/dom/workers/test/subdir/Makefile.in
diff --git a/dom/workers/test/subdir/moz.build b/dom/workers/test/subdir/moz.build