Bug 924549 - Add MOCHITEST_WEBAPPRT_CHROME_MANIFESTS to specify webapprt chrome tests and convert all the webapprt mochitests to use manifests. r=gps

build/docs/test_manifests.rst

@@ -31,6 +31,9 @@ a11y.ini
 xpcshell.ini
    For *xpcshell* tests.
 
+webapprt.ini
+   For the *chrome* flavor of webapp runtime mochitests.
+
 .. _manifest_destiny_manifests:
 
 Manifest Destiny Manifests

config/makefiles/mochitest.mk

@@ -47,11 +47,6 @@ MOCHITEST_ROBOCOP_DEST := $(call mochitestdir,tests/robocop,flat_hierarchy)
 INSTALL_TARGETS += MOCHITEST_ROBOCOP
 endif
 
-ifdef MOCHITEST_WEBAPPRT_CHROME_FILES
-MOCHITEST_WEBAPPRT_CHROME_DEST := $(call mochitestdir,webapprtChrome)
-INSTALL_TARGETS += MOCHITEST_WEBAPPRT_CHROME
-endif
-
 INCLUDED_TESTS_MOCHITEST_MK := 1
 
 endif #} INCLUDED_TESTS_MOCHITEST_MK

config/rules.mk

@@ -52,6 +52,7 @@ _DEPRECATED_VARIABLES := \
   XPIDL_FLAGS \
   MOCHITEST_FILES_PARTS \
   MOCHITEST_BROWSER_FILES_PARTS \
+  MOCHITEST_WEBAPPRT_CHROME_FILES \
   $(NULL)
 
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
@@ -1728,7 +1729,6 @@ FREEZE_VARIABLES = \
   MOCHITEST_A11Y_FILES \
   MOCHITEST_METRO_FILES \
   MOCHITEST_ROBOCOP_FILES \
-  MOCHITEST_WEBAPPRT_CHROME_FILES \
   $(NULL)
 
 $(foreach var,$(FREEZE_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))

js/src/config/makefiles/mochitest.mk

@@ -47,11 +47,6 @@ MOCHITEST_ROBOCOP_DEST := $(call mochitestdir,tests/robocop,flat_hierarchy)
 INSTALL_TARGETS += MOCHITEST_ROBOCOP
 endif
 
-ifdef MOCHITEST_WEBAPPRT_CHROME_FILES
-MOCHITEST_WEBAPPRT_CHROME_DEST := $(call mochitestdir,webapprtChrome)
-INSTALL_TARGETS += MOCHITEST_WEBAPPRT_CHROME
-endif
-
 INCLUDED_TESTS_MOCHITEST_MK := 1
 
 endif #} INCLUDED_TESTS_MOCHITEST_MK

js/src/config/rules.mk

@@ -52,6 +52,7 @@ _DEPRECATED_VARIABLES := \
   XPIDL_FLAGS \
   MOCHITEST_FILES_PARTS \
   MOCHITEST_BROWSER_FILES_PARTS \
+  MOCHITEST_WEBAPPRT_CHROME_FILES \
   $(NULL)
 
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
@@ -1728,7 +1729,6 @@ FREEZE_VARIABLES = \
   MOCHITEST_A11Y_FILES \
   MOCHITEST_METRO_FILES \
   MOCHITEST_ROBOCOP_FILES \
-  MOCHITEST_WEBAPPRT_CHROME_FILES \
   $(NULL)
 
 $(foreach var,$(FREEZE_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))

python/mozbuild/mozbuild/frontend/emitter.py

@@ -231,6 +231,7 @@ class TreeMetadataEmitter(LoggingMixin):
             METRO_CHROME=('metro-chrome', 'testing/mochitest/metro', True),
             MOCHITEST=('mochitest', 'testing/mochitest/tests', True),
             MOCHITEST_CHROME=('chrome', 'testing/mochitest/chrome', True),
+            MOCHITEST_WEBAPPRT_CHROME=('webapprt-chrome', 'testing/mochitest/webapprtChrome', True),
             WEBRTC_SIGNALLING_TEST=('steeplechase', 'steeplechase', True),
             XPCSHELL_TESTS=('xpcshell', 'xpcshell', False),
         )

python/mozbuild/mozbuild/frontend/sandbox_symbols.py

@@ -481,12 +481,16 @@ VARIABLES = {
         """List of manifest files defining metro browser chrome tests.
         """, None),
 
+    'MOCHITEST_CHROME_MANIFESTS': (StrictOrderingOnAppendList, list, [],
+        """List of manifest files defining mochitest chrome tests.
+        """, None),
+
     'MOCHITEST_MANIFESTS': (StrictOrderingOnAppendList, list, [],
         """List of manifest files defining mochitest tests.
         """, None),
 
-    'MOCHITEST_CHROME_MANIFESTS': (StrictOrderingOnAppendList, list, [],
-        """List of manifest files defining mochitest chrome tests.
+    'MOCHITEST_WEBAPPRT_CHROME_MANIFESTS': (StrictOrderingOnAppendList, list, [],
+        """List of manifest files defining webapprt mochitest chrome tests.
         """, None),
 
     'WEBRTC_SIGNALLING_TEST_MANIFESTS': (StrictOrderingOnAppendList, list, [],

webapprt/moz.build

@@ -12,7 +12,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
     DIRS += ['gtk2']
 
 DIRS += ['locales']
-TEST_DIRS += ['test']
 
 EXTRA_COMPONENTS += [
     'CommandLineHandler.js',
@@ -28,3 +27,7 @@ EXTRA_JS_MODULES += [
     'WebappRT.jsm',
     'WebappsHandler.jsm',
 ]
+
+MOCHITEST_WEBAPPRT_CHROME_MANIFESTS += ['test/chrome/webapprt.ini']
+MOCHITEST_MANIFESTS += ['test/content/mochitest.ini']
+

webapprt/test/chrome/Makefile.in

@@ -1,40 +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_WEBAPPRT_CHROME_FILES = \
-  head.js \
-  browser_sample.js \
-    sample.webapp \
-    sample.webapp^headers^ \
-    sample.html \
-  browser_window-title.js \
-    window-title.webapp \
-    window-title.webapp^headers^ \
-    window-title.html \
-  browser_webperm.js \
-    webperm.webapp \
-    webperm.webapp^headers^ \
-    webperm.html \
-  browser_noperm.js \
-    noperm.webapp \
-    noperm.webapp^headers^ \
-    noperm.html \
-  browser_geolocation-prompt-perm.js \
-  browser_geolocation-prompt-noperm.js \
-    geolocation-prompt-perm.webapp \
-    geolocation-prompt-perm.webapp^headers^ \
-    geolocation-prompt-noperm.webapp \
-    geolocation-prompt-noperm.webapp^headers^ \
-    geolocation-prompt-perm.html \
-    geolocation-prompt-noperm.html \
-  browser_debugger.js \
-    debugger.webapp \
-    debugger.webapp^headers^ \
-    debugger.html \
-  browser_mozpay.js \
-    mozpay.webapp \
-    mozpay.webapp^headers^ \
-    mozpay.html \
-    mozpay-success.html \
-  $(NULL)

webapprt/test/chrome/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/.
-

webapprt/test/chrome/webapprt.ini

@@ -0,0 +1,38 @@
+[DEFAULT]
+support-files =
+  head.js
+  sample.webapp
+  sample.webapp^headers^
+  sample.html
+  window-title.webapp
+  window-title.webapp^headers^
+  window-title.html
+  webperm.webapp
+  webperm.webapp^headers^
+  webperm.html
+  noperm.webapp
+  noperm.webapp^headers^
+  noperm.html
+  geolocation-prompt-perm.webapp
+  geolocation-prompt-perm.webapp^headers^
+  geolocation-prompt-noperm.webapp
+  geolocation-prompt-noperm.webapp^headers^
+  geolocation-prompt-perm.html
+  geolocation-prompt-noperm.html
+  debugger.webapp
+  debugger.webapp^headers^
+  debugger.html
+  mozpay.webapp
+  mozpay.webapp^headers^
+  mozpay.html
+  mozpay-success.html
+
+
+[browser_sample.js]
+[browser_window-title.js]
+[browser_webperm.js]
+[browser_noperm.js]
+[browser_geolocation-prompt-perm.js]
+[browser_geolocation-prompt-noperm.js]
+[browser_debugger.js]
+[browser_mozpay.js]

webapprt/test/content/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 = \
-  test.webapp \
-  test.webapp^headers^ \
-  webapprt_sample.html \
-  webapprt_indexeddb.html \
-  $(NULL)

webapprt/test/content/mochitest.ini

@@ -0,0 +1,7 @@
+[DEFAULT]
+support-files =
+  test.webapp
+  test.webapp^headers^
+
+[webapprt_sample.html]
+[webapprt_indexeddb.html]

webapprt/test/content/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/.
-

webapprt/test/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/.
-
-DIRS += ['chrome', 'content']