Bug 1608304 part 1 - Move test of address book UI from mailnews/addrbook to mail/components/addrbook; r=mkmelin
authorGeoff Lankow <geoff@darktrojan.net>
Mon, 06 Jan 2020 11:02:43 +1300
changeset 37950 d85625eb94fbacbcbb6d442ed66039e709cc3708
parent 37949 ac3819169b5030145fee3d92c7f120e0423c20e5
child 37951 f39320031868079d2bcab28327cafd1dc8f3329b
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewersmkmelin
bugs1608304
Bug 1608304 part 1 - Move test of address book UI from mailnews/addrbook to mail/components/addrbook; r=mkmelin
mail/components/addrbook/moz.build
mail/components/addrbook/test/browser/browser.ini
mail/components/addrbook/test/browser/browser_mailing_lists.js
mail/components/addrbook/test/browser/head.js
mail/components/addrbook/test/moz.build
mail/components/compose/moz.build
mailnews/addrbook/test/browser/browser.ini
mailnews/addrbook/test/browser/browser_mailing_lists.js
mailnews/addrbook/test/browser/head.js
mailnews/addrbook/test/moz.build
--- a/mail/components/addrbook/moz.build
+++ b/mail/components/addrbook/moz.build
@@ -1,8 +1,8 @@
 # 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/.
 
 JAR_MANIFESTS += ['jar.mn']
 
-DEFINES['TOOLKIT_DIR'] = "%s/toolkit" % (CONFIG['moztopsrcdir'],)
+TEST_DIRS += ['test']
rename from mailnews/addrbook/test/browser/browser.ini
rename to mail/components/addrbook/test/browser/browser.ini
rename from mailnews/addrbook/test/browser/browser_mailing_lists.js
rename to mail/components/addrbook/test/browser/browser_mailing_lists.js
rename from mailnews/addrbook/test/browser/head.js
rename to mail/components/addrbook/test/browser/head.js
new file mode 100644
--- /dev/null
+++ b/mail/components/addrbook/test/moz.build
@@ -0,0 +1,8 @@
+# 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/.
+
+BROWSER_CHROME_MANIFESTS += [
+    'browser/browser.ini',
+]
--- a/mail/components/compose/moz.build
+++ b/mail/components/compose/moz.build
@@ -7,10 +7,8 @@ JAR_MANIFESTS += ['jar.mn']
 
 EXTRA_JS_MODULES += [
     'editorUtilities.jsm',
 ]
 
 JS_PREFERENCE_PP_FILES += [
     'composer.js'
 ]
-
-DEFINES['TOOLKIT_DIR'] = "%s/toolkit" % (CONFIG['moztopsrcdir'],)
--- a/mailnews/addrbook/test/moz.build
+++ b/mailnews/addrbook/test/moz.build
@@ -2,12 +2,8 @@
 # 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/.
 
 XPCSHELL_TESTS_MANIFESTS += [
     'unit/xpcshell.ini',
     'unit/xpcshell_migration.ini',
 ]
-
-BROWSER_CHROME_MANIFESTS += [
-    'browser/browser.ini',
-]