Bug 939048 - Part f: Move mochitests to manifests in dom/workers; r=jst
authorMs2ger <ms2ger@gmail.com>
Tue, 31 Dec 2013 10:06:11 +0100
changeset 177885 b6471e45332ee5f77cc4a1ff647b1c45d62635f8
parent 177884 e1338d23836252865e7764831d723fa122492592
child 177886 e13c3d784aa2c1384e9c007e0a4af03df0630098
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs939048
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 939048 - Part f: Move mochitests to manifests in dom/workers; r=jst
dom/workers/test/Makefile.in
dom/workers/test/mochitest.ini
dom/workers/test/moz.build
dom/workers/test/subdir/Makefile.in
dom/workers/test/subdir/moz.build
deleted file mode 100644
--- a/dom/workers/test/Makefile.in
+++ /dev/null
@@ -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
--- a/dom/workers/test/mochitest.ini
+++ b/dom/workers/test/mochitest.ini
@@ -53,16 +53,19 @@ support-files =
   workersDisabled_worker.js
   xhr2_worker.js
   xhrAbort_worker.js
   xhr_implicit_cancel_worker.js
   xhr_worker.js
   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]
 [test_blobConstructor.html]
 [test_blobWorkers.html]
 [test_chromeWorker.html]
 [test_clearTimeouts.html]
 [test_close.html]
@@ -109,11 +112,13 @@ support-files =
 [test_xhr.html]
 [test_xhr2.html]
 [test_xhrAbort.html]
 [test_xhr_implicit_cancel.html]
 [test_xhr_parameters.html]
 [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]
--- a/dom/workers/test/moz.build
+++ b/dom/workers/test/moz.build
@@ -1,16 +1,15 @@
 # -*- 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/.
 
 DIRS += [
     'extensions',
-    'subdir',
 ]
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
 XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
deleted file mode 100644
--- a/dom/workers/test/subdir/Makefile.in
+++ /dev/null
@@ -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)
deleted file mode 100644
--- a/dom/workers/test/subdir/moz.build
+++ /dev/null
@@ -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/.
-