Bug 939271 - Part f: move mochitests to manifests in js/xpconnect; r=bholley

js/xpconnect/tests/chrome/Makefile.in

@@ -1,18 +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/.
-
-ifneq ($(OS_ARCH),WINNT)
-MOCHITEST_CHROME_FILES += \
-		test_weakmaps.xul \
-		$(NULL)
-else
-$(filter disabled-temporarily--bug-820471, test_weakmaps.xul)
-endif
-
-# Disabled until this test gets updated to test the new proxy based
-# wrappers.
-#		test_wrappers-2.xul \
-
-# Disabled due to apparent conservative stack scanner false positives on Linux64 debug.
-#		test_watchpoints.xul \

js/xpconnect/tests/chrome/chrome.ini

@@ -70,3 +70,11 @@ support-files =
 [test_weakmap_keys_preserved2.xul]
 [test_weakref.xul]
 [test_wrappers.xul]
+[test_weakmaps.xul]
+skip-if = os == "win" # Bug 820471
+[test_wrappers-2.xul]
+# Disabled until this test gets updated to test the new proxy based wrappers.
+skip-if = true
+[test_watchpoints.xul]
+# Disabled due to apparent conservative stack scanner false positives on Linux64 debug.
+skip-if = true

js/xpconnect/tests/chrome/moz.build

@@ -1,8 +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/.
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-

js/xpconnect/tests/moz.build

@@ -7,10 +7,11 @@
 TEST_TOOL_DIRS += [
     'idl',
     'mochitest',
-    'chrome',
     'browser',
     'components/native',
     'components/js',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini']
+