From 8c3a46bd13a0660a3ff1e0379dbf515873a852d2 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 3 Feb 2018 06:01:32 -0500 Subject: Remove browser tests - Part 2: Build System --- browser/base/moz.build | 28 ------------------------- browser/components/contextualidentity/moz.build | 7 ------- browser/components/customizableui/moz.build | 5 ----- browser/components/downloads/moz.build | 9 -------- browser/components/extensions/moz.build | 3 --- browser/components/feeds/moz.build | 7 ------- browser/components/migration/moz.build | 9 -------- browser/components/moz.build | 16 -------------- browser/components/newtab/moz.build | 6 ------ browser/components/places/moz.build | 7 ------- browser/components/preferences/moz.build | 7 ------- browser/components/privatebrowsing/moz.build | 7 ------- browser/components/search/moz.build | 7 ------- browser/components/selfsupport/moz.build | 4 ---- browser/components/sessionstore/moz.build | 6 ------ browser/components/shell/moz.build | 6 ------ browser/components/syncedtabs/moz.build | 7 ------- browser/components/translation/moz.build | 8 ------- browser/components/uitour/moz.build | 7 ------- browser/extensions/formautofill/moz.build | 4 ---- browser/extensions/pdfjs/moz.build | 2 -- browser/extensions/pocket/moz.build | 2 -- browser/extensions/webcompat/moz.build | 2 -- browser/modules/moz.build | 6 ------ 24 files changed, 172 deletions(-) diff --git a/browser/base/moz.build b/browser/base/moz.build index 466349992..b21c0ac29 100644 --- a/browser/base/moz.build +++ b/browser/base/moz.build @@ -4,34 +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/. -SPHINX_TREES['sslerrorreport'] = 'content/docs/sslerrorreport' - -MOCHITEST_MANIFESTS += [ - 'content/test/general/mochitest.ini', -] - -MOCHITEST_CHROME_MANIFESTS += [ - 'content/test/chrome/chrome.ini', -] - -BROWSER_CHROME_MANIFESTS += [ - 'content/test/alerts/browser.ini', - 'content/test/captivePortal/browser.ini', - 'content/test/general/browser.ini', - 'content/test/newtab/browser.ini', - 'content/test/plugins/browser.ini', - 'content/test/popupNotifications/browser.ini', - 'content/test/popups/browser.ini', - 'content/test/referrer/browser.ini', - 'content/test/siteIdentity/browser.ini', - 'content/test/social/browser.ini', - 'content/test/tabcrashed/browser.ini', - 'content/test/tabPrompts/browser.ini', - 'content/test/tabs/browser.ini', - 'content/test/urlbar/browser.ini', - 'content/test/webrtc/browser.ini', -] - DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY'] diff --git a/browser/components/contextualidentity/moz.build b/browser/components/contextualidentity/moz.build index 62d333db8..aac3a838c 100644 --- a/browser/components/contextualidentity/moz.build +++ b/browser/components/contextualidentity/moz.build @@ -4,11 +4,4 @@ # 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 += [ - 'test/browser/browser.ini', -] - JAR_MANIFESTS += ['jar.mn'] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Contextual Identity') diff --git a/browser/components/customizableui/moz.build b/browser/components/customizableui/moz.build index 72ec391d8..034630dc9 100644 --- a/browser/components/customizableui/moz.build +++ b/browser/components/customizableui/moz.build @@ -8,8 +8,6 @@ DIRS += [ 'content', ] -BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] - EXTRA_JS_MODULES += [ 'CustomizableUI.jsm', 'CustomizableWidgets.jsm', @@ -21,6 +19,3 @@ EXTRA_JS_MODULES += [ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Toolbars and Customization') diff --git a/browser/components/downloads/moz.build b/browser/components/downloads/moz.build index 2b06a6465..241354619 100644 --- a/browser/components/downloads/moz.build +++ b/browser/components/downloads/moz.build @@ -4,12 +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/. -with Files('*'): - BUG_COMPONENT = ('Firefox', 'Downloads Panel') - -XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] -BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] - JAR_MANIFESTS += ['jar.mn'] EXTRA_JS_MODULES += [ @@ -17,6 +11,3 @@ EXTRA_JS_MODULES += [ 'DownloadsTaskbar.jsm', 'DownloadsViewUI.jsm', ] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Downloads Panel') diff --git a/browser/components/extensions/moz.build b/browser/components/extensions/moz.build index 5b3654c3a..116e90415 100644 --- a/browser/components/extensions/moz.build +++ b/browser/components/extensions/moz.build @@ -12,6 +12,3 @@ EXTRA_COMPONENTS += [ DIRS += ['schemas'] -BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] -MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini'] -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] diff --git a/browser/components/feeds/moz.build b/browser/components/feeds/moz.build index c22129165..b8755fcc9 100644 --- a/browser/components/feeds/moz.build +++ b/browser/components/feeds/moz.build @@ -4,10 +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/. -XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] -MOCHITEST_CHROME_MANIFESTS += ['test/chrome/chrome.ini'] -MOCHITEST_MANIFESTS += ['test/mochitest.ini'] - JAR_MANIFESTS += ['jar.mn'] XPIDL_SOURCES += [ @@ -36,6 +32,3 @@ for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'): LOCAL_INCLUDES += [ '../build', ] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'RSS Discovery and Preview') diff --git a/browser/components/migration/moz.build b/browser/components/migration/moz.build index 751ea0cd9..465e3eade 100644 --- a/browser/components/migration/moz.build +++ b/browser/components/migration/moz.build @@ -4,12 +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/. -XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] - -MARIONETTE_UNIT_MANIFESTS += ['tests/marionette/manifest.ini'] - -BROWSER_CHROME_MANIFESTS += [ 'tests/browser/browser.ini'] - JAR_MANIFESTS += ['jar.mn'] XPIDL_SOURCES += [ @@ -57,6 +51,3 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': DEFINES['HAS_SAFARI_MIGRATOR'] = True FINAL_LIBRARY = 'browsercomps' - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Migration') diff --git a/browser/components/moz.build b/browser/components/moz.build index 5ad29d088..3c0dea3fb 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -14,7 +14,6 @@ DIRS += [ 'feeds', 'migration', 'newtab', - 'originattributes', 'places', 'preferences', 'privatebrowsing', @@ -48,18 +47,3 @@ EXTRA_COMPONENTS += [ EXTRA_JS_MODULES += [ 'distribution.js', ] - -BROWSER_CHROME_MANIFESTS += [ - 'safebrowsing/content/test/browser.ini', - 'tests/browser/browser.ini' -] - -XPCSHELL_TESTS_MANIFESTS += [ - 'tests/unit/xpcshell.ini' -] - -with Files('safebrowsing/*'): - BUG_COMPONENT = ('Toolkit', 'Phishing Protection') - -with Files('controlcenter/**'): - BUG_COMPONENT = ('Firefox', 'General') diff --git a/browser/components/newtab/moz.build b/browser/components/newtab/moz.build index 37c9983f7..3d3be6454 100644 --- a/browser/components/newtab/moz.build +++ b/browser/components/newtab/moz.build @@ -4,12 +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/. -BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini'] - -XPCSHELL_TESTS_MANIFESTS += [ - 'tests/xpcshell/xpcshell.ini', -] - EXTRA_JS_MODULES += [ 'NewTabMessages.jsm', 'NewTabPrefsProvider.jsm', diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build index e6f88b318..9e5a2c074 100644 --- a/browser/components/places/moz.build +++ b/browser/components/places/moz.build @@ -4,15 +4,8 @@ # 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 += ['tests/unit/xpcshell.ini'] -MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini'] -BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini'] - JAR_MANIFESTS += ['jar.mn'] EXTRA_JS_MODULES += [ 'PlacesUIUtils.jsm', ] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Bookmarks & History') diff --git a/browser/components/preferences/moz.build b/browser/components/preferences/moz.build index 5415399a0..adee51e3b 100644 --- a/browser/components/preferences/moz.build +++ b/browser/components/preferences/moz.build @@ -6,10 +6,6 @@ DIRS += ['in-content'] -BROWSER_CHROME_MANIFESTS += [ - 'in-content/tests/browser.ini', -] - for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'): DEFINES[var] = CONFIG[var] @@ -17,6 +13,3 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'): DEFINES['HAVE_SHELL_SERVICE'] = 1 JAR_MANIFESTS += ['jar.mn'] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Preferences') diff --git a/browser/components/privatebrowsing/moz.build b/browser/components/privatebrowsing/moz.build index 486737a7f..aac3a838c 100644 --- a/browser/components/privatebrowsing/moz.build +++ b/browser/components/privatebrowsing/moz.build @@ -4,11 +4,4 @@ # 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 += [ - 'test/browser/browser.ini', -] - JAR_MANIFESTS += ['jar.mn'] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Private Browsing') diff --git a/browser/components/search/moz.build b/browser/components/search/moz.build index 618cd7657..aac3a838c 100644 --- a/browser/components/search/moz.build +++ b/browser/components/search/moz.build @@ -4,11 +4,4 @@ # 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 += [ - 'test/browser.ini', -] - JAR_MANIFESTS += ['jar.mn'] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Search') diff --git a/browser/components/selfsupport/moz.build b/browser/components/selfsupport/moz.build index daa59ac97..f8923b081 100644 --- a/browser/components/selfsupport/moz.build +++ b/browser/components/selfsupport/moz.build @@ -8,7 +8,3 @@ EXTRA_COMPONENTS += [ 'SelfSupportService.js', 'SelfSupportService.manifest', ] - -BROWSER_CHROME_MANIFESTS += [ - 'test/browser.ini', -] diff --git a/browser/components/sessionstore/moz.build b/browser/components/sessionstore/moz.build index 8a8221c9f..3117f02c7 100644 --- a/browser/components/sessionstore/moz.build +++ b/browser/components/sessionstore/moz.build @@ -4,9 +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/. -XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] -BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] - JAR_MANIFESTS += ['jar.mn'] XPIDL_SOURCES += [ @@ -47,6 +44,3 @@ EXTRA_JS_MODULES.sessionstore = [ 'TabStateCache.jsm', 'TabStateFlusher.jsm', ] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Session Restore') diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build index 7a605de5f..94ec88571 100644 --- a/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build @@ -4,9 +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/. -XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] -BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] - JAR_MANIFESTS += ['jar.mn'] XPIDL_SOURCES += [ @@ -57,6 +54,3 @@ for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'): DEFINES[var] = '"%s"' % CONFIG[var] CXXFLAGS += CONFIG['TK_CFLAGS'] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Shell Integration') diff --git a/browser/components/syncedtabs/moz.build b/browser/components/syncedtabs/moz.build index 93c98e65d..a6515d6a1 100644 --- a/browser/components/syncedtabs/moz.build +++ b/browser/components/syncedtabs/moz.build @@ -4,10 +4,6 @@ JAR_MANIFESTS += ['jar.mn'] -BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] - -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] - EXTRA_JS_MODULES.syncedtabs += [ 'EventEmitter.jsm', 'SyncedTabsDeckComponent.js', @@ -19,6 +15,3 @@ EXTRA_JS_MODULES.syncedtabs += [ 'util.js', ] -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Synced tabs') - diff --git a/browser/components/translation/moz.build b/browser/components/translation/moz.build index 468f2af20..ac0165230 100644 --- a/browser/components/translation/moz.build +++ b/browser/components/translation/moz.build @@ -14,11 +14,3 @@ EXTRA_JS_MODULES.translation = [ ] JAR_MANIFESTS += ['jar.mn'] - -BROWSER_CHROME_MANIFESTS += [ - 'test/browser.ini' -] - -XPCSHELL_TESTS_MANIFESTS += [ - 'test/unit/xpcshell.ini' -] diff --git a/browser/components/uitour/moz.build b/browser/components/uitour/moz.build index 51e6037cc..c8b1450b9 100644 --- a/browser/components/uitour/moz.build +++ b/browser/components/uitour/moz.build @@ -7,10 +7,3 @@ EXTRA_JS_MODULES += [ ] JAR_MANIFESTS += ['jar.mn'] - -BROWSER_CHROME_MANIFESTS += [ - 'test/browser.ini', -] - -with Files('**'): - BUG_COMPONENT = ('Firefox', 'Tours') diff --git a/browser/extensions/formautofill/moz.build b/browser/extensions/formautofill/moz.build index 92577db53..abcc659ee 100644 --- a/browser/extensions/formautofill/moz.build +++ b/browser/extensions/formautofill/moz.build @@ -15,8 +15,4 @@ FINAL_TARGET_PP_FILES.features['formautofill@mozilla.org'] += [ 'install.rdf.in' ] -BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] - -XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] - JAR_MANIFESTS += ['jar.mn'] diff --git a/browser/extensions/pdfjs/moz.build b/browser/extensions/pdfjs/moz.build index a1d2634da..aac3a838c 100644 --- a/browser/extensions/pdfjs/moz.build +++ b/browser/extensions/pdfjs/moz.build @@ -4,6 +4,4 @@ # 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 += ['test/browser.ini'] - JAR_MANIFESTS += ['jar.mn'] diff --git a/browser/extensions/pocket/moz.build b/browser/extensions/pocket/moz.build index 495e48a62..52227bb8b 100644 --- a/browser/extensions/pocket/moz.build +++ b/browser/extensions/pocket/moz.build @@ -17,6 +17,4 @@ FINAL_TARGET_PP_FILES.features['firefox@getpocket.com'] += [ 'install.rdf.in' ] -BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] - JAR_MANIFESTS += ['jar.mn'] diff --git a/browser/extensions/webcompat/moz.build b/browser/extensions/webcompat/moz.build index 2423511b4..7d592013b 100644 --- a/browser/extensions/webcompat/moz.build +++ b/browser/extensions/webcompat/moz.build @@ -14,5 +14,3 @@ FINAL_TARGET_FILES.features['webcompat@mozilla.org'] += [ FINAL_TARGET_PP_FILES.features['webcompat@mozilla.org'] += [ 'install.rdf.in' ] - -BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] diff --git a/browser/modules/moz.build b/browser/modules/moz.build index d71305198..852a4c911 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -4,12 +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/. -BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] -XPCSHELL_TESTS_MANIFESTS += [ - 'test/unit/social/xpcshell.ini', - 'test/xpcshell/xpcshell.ini', -] - EXTRA_JS_MODULES += [ 'AboutHome.jsm', 'AboutNewTab.jsm', -- cgit v1.2.3