Bug 939048 - Part c: Move mochitests to manifests in dom/tests/mochitest/pointerlock; r=jst

dom/tests/mochitest/moz.build

@@ -16,7 +16,6 @@ DIRS += [
     'orientation',
     'sessionstorage',
     'storageevent',
-    'pointerlock',
     'notification',
     'webapps',
     'webcomponents',
@@ -35,3 +34,9 @@ MOCHITEST_MANIFESTS += [
 MOCHITEST_CHROME_MANIFESTS += [
     'whatwg/chrome.ini',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gtk2':
+    # Bug 788164.
+    MOCHITEST_MANIFESTS += [
+        'pointerlock/mochitest.ini',
+    ]

dom/tests/mochitest/pointerlock/Makefile.in

@@ -1,34 +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	= \
-		pointerlock_utils.js \
-		file_approval.html \
-		file_pointerlock-api.html \
-		file_pointerlockerror.html \
-		file_escapeKey.html \
-		file_withoutDOM.html \
-		file_removedFromDOM.html \
-		file_pointerLockPref.html \
-		file_nestedFullScreen.html \
-		file_doubleLock.html \
-		file_childIframe.html \
-		file_movementXY.html \
-		file_infiniteMovement.html \
-		file_retargetMouseEvents.html \
-		file_targetOutOfFocus.html \
-		file_screenClientXYConst.html \
-		file_suppressSomeMouseEvents.html \
-		file_locksvgelement.html \
-		file_allowPointerLockSandboxFlag.html \
-		iframe_differentDOM.html \
-		$(NULL)
-
-ifneq (gtk2,$(MOZ_WIDGET_TOOLKIT))
-MOCHITEST_FILES += \
-		test_pointerlock-api.html \
-		$(NULL)
-else
-$(filter disabled-on-linux-for-intermittent-failures--bug-788164, test_pointerlock-api.html)
-endif

dom/tests/mochitest/pointerlock/mochitest.ini

@@ -0,0 +1,27 @@
+# NOTE: Bug 788164: the tests in this file are disabled on Linux
+#       in dom/tests/mochitest/moz.build for intermittent failures.
+
+[DEFAULT]
+support-files =
+  pointerlock_utils.js
+  file_approval.html
+  file_pointerlock-api.html
+  file_pointerlockerror.html
+  file_escapeKey.html
+  file_withoutDOM.html
+  file_removedFromDOM.html
+  file_pointerLockPref.html
+  file_nestedFullScreen.html
+  file_doubleLock.html
+  file_childIframe.html
+  file_movementXY.html
+  file_infiniteMovement.html
+  file_retargetMouseEvents.html
+  file_targetOutOfFocus.html
+  file_screenClientXYConst.html
+  file_suppressSomeMouseEvents.html
+  file_locksvgelement.html
+  file_allowPointerLockSandboxFlag.html
+  iframe_differentDOM.html
+
+[test_pointerlock-api.html]

dom/tests/mochitest/pointerlock/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/.
-