Bug 924523 - Part c: use mochitest manifests in dom/tests/mochitest/ajax/offline; r=jst

dom/tests/mochitest/ajax/moz.build

@@ -6,13 +6,13 @@
 
 DIRS += [
     'lib',
-    'offline',
     'mochikit',
     'scriptaculous',
 ]
 
 MOCHITEST_MANIFESTS += [
     'jquery/mochitest.ini',
+    'offline/mochitest.ini',
     'prototype/mochitest.ini',
 ]
 

dom/tests/mochitest/ajax/offline/mochitest.ini

@@ -56,6 +56,13 @@ support-files =
   updatingManifest.sjs
   wildcardManifest.cacheManifest
   wildcardManifest.cacheManifest^headers^
+  namespace1/opp.html
+  namespace1/script.js
+  namespace1/redirectToDifferentOrigin.sjs
+  namespace1/sub/opp.html
+  namespace1/sub/script1.js
+  namespace1/sub2/script2.js
+  namespace2/script3.js
 
 [test_badManifestMagic.html]
 [test_bug445544.html]

dom/tests/mochitest/ajax/offline/moz.build

@@ -1,10 +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/.
-
-DIRS += ['namespace1', 'namespace2']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-

dom/tests/mochitest/ajax/offline/namespace1/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/.
-
-MOCHITEST_FILES	= \
-        opp.html \
-        script.js \
-        redirectToDifferentOrigin.sjs \
-        $(NULL)

dom/tests/mochitest/ajax/offline/namespace1/moz.build

@@ -1,7 +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/.
-
-TEST_DIRS += ['sub', 'sub2']

dom/tests/mochitest/ajax/offline/namespace1/sub/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	= \
-        opp.html \
-        script1.js \
-        $(NULL)

dom/tests/mochitest/ajax/offline/namespace1/sub/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/.
-

dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in

@@ -1,8 +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	= \
-        script2.js \
-        $(NULL)

dom/tests/mochitest/ajax/offline/namespace1/sub2/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/.
-

dom/tests/mochitest/ajax/offline/namespace2/Makefile.in

@@ -1,8 +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	= \
-        script3.js \
-        $(NULL)

dom/tests/mochitest/ajax/offline/namespace2/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/.
-