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

dom/workers/test/Makefile.in

@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Bug 842344, 842386 - Disabled on Windows & OSX for intermittent failures.
-ifeq (,$(filter Darwin WINNT,$(OS_ARCH)))
-MOCHITEST_FILES += \
-  test_xhr_timeout.html \
-  $(NULL)
-endif

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]

dom/workers/test/moz.build

@@ -6,7 +6,6 @@
 
 DIRS += [
     'extensions',
-    'subdir',
 ]
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']

dom/workers/test/subdir/Makefile.in

@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_FILES := \
-  relativeLoad_sub_worker.js \
-  relativeLoad_sub_worker2.js \
-  relativeLoad_sub_import.js \
-  $(NULL)

dom/workers/test/subdir/moz.build

@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-