Bug 923635 - DataStore mochitests should use mochitest.ini file, r=ms2ger

dom/datastore/moz.build

@@ -4,8 +4,6 @@
 # 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',
 ]
@@ -26,3 +24,5 @@ EXTRA_JS_MODULES += [
     'DataStoreDB.jsm',
     'DataStoreServiceInternal.jsm',
 ]
+
+MOCHITEST_MANIFESTS += ['tests/mochitest.ini']

dom/datastore/tests/Makefile.in

@@ -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

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]

dom/datastore/tests/moz.build

@@ -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/.