Bug 923635 - DataStore mochitests should use mochitest.ini file, r=ms2ger
authorAndrea Marchesini <amarchesini@mozilla.com>
Fri, 04 Oct 2013 13:08:28 -0400
changeset 149912 f239497c4d05d75a9d0d8f2b56b7d2ebf472e36a
parent 149911 1e32e9c242ad399fb7e116bd20bf71235d16b7a0
child 149913 faf5a0c01118c15106a25caad309ecb3328bfdd3
push idunknown
push userunknown
push dateunknown
reviewersms2ger
bugs923635
milestone27.0a1
Bug 923635 - DataStore mochitests should use mochitest.ini file, r=ms2ger
dom/datastore/moz.build
dom/datastore/tests/Makefile.in
dom/datastore/tests/mochitest.ini
dom/datastore/tests/moz.build
--- a/dom/datastore/moz.build
+++ b/dom/datastore/moz.build
@@ -1,16 +1,14 @@
 # -*- 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 += ['tests']
-
 XPIDL_SOURCES += [
     'nsIDataStoreService.idl',
 ]
 
 XPIDL_MODULE = 'dom_datastore'
 
 MODULE = 'dom'
 
@@ -21,8 +19,10 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'DataStore.jsm',
     'DataStoreChangeNotifier.jsm',
     'DataStoreCursor.jsm',
     'DataStoreDB.jsm',
     'DataStoreServiceInternal.jsm',
 ]
+
+MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
deleted file mode 100644
--- a/dom/datastore/tests/Makefile.in
+++ /dev/null
@@ -1,36 +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/.
-
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-relativesrcdir   = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MOCHITEST_FILES = \
-  test_app_install.html \
-  file_app_install.html \
-  test_readonly.html \
-  file_readonly.html \
-  test_basic.html \
-  file_basic.html \
-  test_revision.html \
-  file_revision.html \
-  test_changes.html \
-  file_changes.html \
-  file_changes2.html \
-  file_app.sjs \
-  file_app.template.webapp \
-  file_app2.template.webapp \
-  test_arrays.html \
-  file_arrays.html \
-  test_oop.html \
-  test_sync.html \
-  file_sync.html \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
new file mode 100644
--- /dev/null
+++ b/dom/datastore/tests/mochitest.ini
@@ -0,0 +1,22 @@
+[DEFAULT]
+support-files =
+  file_app_install.html
+  file_readonly.html
+  file_basic.html
+  file_revision.html
+  file_changes.html
+  file_changes2.html
+  file_app.sjs
+  file_app.template.webapp
+  file_app2.template.webapp
+  file_arrays.html
+  file_sync.html
+
+[test_app_install.html]
+[test_readonly.html]
+[test_basic.html]
+[test_revision.html]
+[test_changes.html]
+[test_arrays.html]
+[test_oop.html]
+[test_sync.html]
deleted file mode 100644
--- a/dom/datastore/tests/moz.build
+++ /dev/null
@@ -1,5 +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/.