From 94d34b65132b831c9477f2d2b93ffb3cb5ca308d Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 11 Feb 2013 14:10:16 +0100 Subject: [PATCH] Bug 755724 - Move browser application in a subdirectory. r=jimm --- CLOBBER | 2 +- browser/app-rules.mk | 1 + browser/app/Makefile.in | 2 + browser/app/nsBrowserApp.cpp | 1 + .../dirprovider/tests/unit/xpcshell.ini | 1 + .../downloads/test/unit/xpcshell.ini | 1 + .../components/feeds/test/unit/xpcshell.ini | 1 + .../migration/tests/unit/xpcshell.ini | 1 + .../components/places/tests/unit/xpcshell.ini | 1 + .../sessionstore/test/unit/xpcshell.ini | 3 +- .../components/shell/test/unit/xpcshell.ini | 1 + browser/defs.mk | 2 + .../devtools/shared/test/unit/xpcshell.ini | 1 + browser/installer/package-manifest.in | 153 +++++++++--------- browser/locales/jar.mn | 2 +- browser/modules/test/unit/xpcshell.ini | 1 + services/common/tests/unit/xpcshell.ini | 1 + .../crypto/component/tests/unit/xpcshell.ini | 1 + services/crypto/tests/unit/xpcshell.ini | 1 + services/sync/tests/unit/xpcshell.ini | 1 + .../downloads/test/unit/xpcshell.ini | 1 + .../places/tests/autocomplete/xpcshell.ini | 1 + .../components/places/tests/unit/xpcshell.ini | 1 + .../search/tests/xpcshell/xpcshell.ini | 1 + .../extensions/test/xpcshell/xpcshell.ini | 1 + 25 files changed, 106 insertions(+), 77 deletions(-) create mode 100644 browser/app-rules.mk create mode 100644 browser/defs.mk diff --git a/CLOBBER b/CLOBBER index 066f76de256..85042f2ce43 100644 --- a/CLOBBER +++ b/CLOBBER @@ -15,4 +15,4 @@ # # Note: The description below will be part of the error message shown to users. # -Bug 793928 - Move the promise library to a new location +Bug 755724 - Move browser application in a subdirectory diff --git a/browser/app-rules.mk b/browser/app-rules.mk new file mode 100644 index 00000000000..2c31653046f --- /dev/null +++ b/browser/app-rules.mk @@ -0,0 +1 @@ +PURGECACHES_DIRS = $(DIST)/bin/browser diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 04a5386a715..95bf1fb2c82 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -102,6 +102,8 @@ RCFLAGS += -DMOZ_PHOENIX RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\" endif +PROGRAMS_DEST = $(DIST)/bin + include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) #{ diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index 584df54ac31..4b27a9732be 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -178,6 +178,7 @@ static int do_main(int argc, char* argv[], nsIFile *xreDirectory) } nsCOMPtr appDir; exeFile->GetParent(getter_AddRefs(appDir)); + appDir->Append(NS_LITERAL_STRING("browser")); SetStrongPtr(appData.directory, static_cast(appDir.get())); // xreDirectory already has a refcount from NS_NewLocalFile diff --git a/browser/components/dirprovider/tests/unit/xpcshell.ini b/browser/components/dirprovider/tests/unit/xpcshell.ini index dc6d591390e..27afed6507b 100644 --- a/browser/components/dirprovider/tests/unit/xpcshell.ini +++ b/browser/components/dirprovider/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_dirprovider.js tail = +firefox-appdir = browser [test_bookmark_pref.js] [test_keys.js] diff --git a/browser/components/downloads/test/unit/xpcshell.ini b/browser/components/downloads/test/unit/xpcshell.ini index e24cb6e0c3a..924123c7422 100644 --- a/browser/components/downloads/test/unit/xpcshell.ini +++ b/browser/components/downloads/test/unit/xpcshell.ini @@ -1,5 +1,6 @@ [DEFAULT] head = head.js tail = +firefox-appdir = browser [test_DownloadsCommon.js] diff --git a/browser/components/feeds/test/unit/xpcshell.ini b/browser/components/feeds/test/unit/xpcshell.ini index ec16259754f..abe78689750 100644 --- a/browser/components/feeds/test/unit/xpcshell.ini +++ b/browser/components/feeds/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_feeds.js tail = +firefox-appdir = browser [test_355473.js] [test_758990.js] diff --git a/browser/components/migration/tests/unit/xpcshell.ini b/browser/components/migration/tests/unit/xpcshell.ini index 2704bc2cfbc..c08c2533f0f 100644 --- a/browser/components/migration/tests/unit/xpcshell.ini +++ b/browser/components/migration/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_migration.js tail = +firefox-appdir = browser [test_IE_bookmarks.js] skip-if = os != "win" diff --git a/browser/components/places/tests/unit/xpcshell.ini b/browser/components/places/tests/unit/xpcshell.ini index 07ae83c5579..e8b2576f663 100644 --- a/browser/components/places/tests/unit/xpcshell.ini +++ b/browser/components/places/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_bookmarks.js tail = +firefox-appdir = browser [test_421483.js] [test_browserGlue_corrupt.js] diff --git a/browser/components/sessionstore/test/unit/xpcshell.ini b/browser/components/sessionstore/test/unit/xpcshell.ini index 10cd5869f9c..661c5d705c7 100644 --- a/browser/components/sessionstore/test/unit/xpcshell.ini +++ b/browser/components/sessionstore/test/unit/xpcshell.ini @@ -1,8 +1,9 @@ [DEFAULT] head = head.js tail = +firefox-appdir = browser [test_startup_nosession_sync.js] [test_startup_nosession_async.js] [test_startup_session_sync.js] -[test_startup_session_async.js] \ No newline at end of file +[test_startup_session_async.js] diff --git a/browser/components/shell/test/unit/xpcshell.ini b/browser/components/shell/test/unit/xpcshell.ini index 469a8444c05..33804fd4217 100644 --- a/browser/components/shell/test/unit/xpcshell.ini +++ b/browser/components/shell/test/unit/xpcshell.ini @@ -1,5 +1,6 @@ [DEFAULT] head = tail = +firefox-appdir = browser [test_421977.js] diff --git a/browser/defs.mk b/browser/defs.mk new file mode 100644 index 00000000000..3eb73eb502f --- /dev/null +++ b/browser/defs.mk @@ -0,0 +1,2 @@ +DIST_SUBDIR=browser +XPI_ROOT_APPID=$(MOZ_APP_ID) diff --git a/browser/devtools/shared/test/unit/xpcshell.ini b/browser/devtools/shared/test/unit/xpcshell.ini index afc258a4f3d..342274bedb6 100644 --- a/browser/devtools/shared/test/unit/xpcshell.ini +++ b/browser/devtools/shared/test/unit/xpcshell.ini @@ -1,5 +1,6 @@ [DEFAULT] head = tail = +firefox-appdir = browser [test_undoStack.js] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 93b7125642f..3dffdcd7fa2 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -30,16 +30,18 @@ #endif [@AB_CD@] +@BINPATH@/browser/chrome/@AB_CD@@JAREXT@ +@BINPATH@/browser/chrome/@AB_CD@.manifest @BINPATH@/chrome/@AB_CD@@JAREXT@ @BINPATH@/chrome/@AB_CD@.manifest -@BINPATH@/defaults/profile/bookmarks.html -@BINPATH@/defaults/profile/chrome/* -@BINPATH@/defaults/profile/localstore.rdf -@BINPATH@/defaults/profile/mimeTypes.rdf +@BINPATH@/browser/defaults/profile/bookmarks.html +@BINPATH@/browser/defaults/profile/chrome/* +@BINPATH@/browser/defaults/profile/localstore.rdf +@BINPATH@/browser/defaults/profile/mimeTypes.rdf @BINPATH@/dictionaries/* @BINPATH@/hyphenation/* -@BINPATH@/@PREF_DIR@/firefox-l10n.js -@BINPATH@/searchplugins/* +@BINPATH@/browser/@PREF_DIR@/firefox-l10n.js +@BINPATH@/browser/searchplugins/* #ifdef XP_WIN32 @BINPATH@/uninstall/helper.exe #endif @@ -123,7 +125,7 @@ #else @BINPATH@/mozsqlt3@DLL_SUFFIX@ #endif -@BINPATH@/blocklist.xml +@BINPATH@/browser/blocklist.xml #ifdef XP_UNIX #ifndef XP_MACOSX @BINPATH@/run-mozilla.sh @@ -132,7 +134,7 @@ #endif ; [Components] -@BINPATH@/components/components.manifest +@BINPATH@/browser/components/components.manifest @BINPATH@/components/alerts.xpt #ifdef ACCESSIBILITY #ifdef XP_WIN32 @@ -145,8 +147,8 @@ @BINPATH@/components/appstartup.xpt @BINPATH@/components/autocomplete.xpt @BINPATH@/components/autoconfig.xpt -@BINPATH@/components/browsercompsbase.xpt -@BINPATH@/components/browser-feeds.xpt +@BINPATH@/browser/components/browsercompsbase.xpt +@BINPATH@/browser/components/browser-feeds.xpt @BINPATH@/components/caps.xpt @BINPATH@/components/chrome.xpt @BINPATH@/components/commandhandler.xpt @@ -223,7 +225,7 @@ @BINPATH@/components/filepicker.xpt #endif @BINPATH@/components/find.xpt -@BINPATH@/components/fuel.xpt +@BINPATH@/browser/components/fuel.xpt @BINPATH@/components/gfx.xpt @BINPATH@/components/html5.xpt @BINPATH@/components/htmlparser.xpt @@ -247,7 +249,7 @@ @BINPATH@/components/layout_xul.xpt @BINPATH@/components/locale.xpt @BINPATH@/components/lwbrk.xpt -@BINPATH@/components/migration.xpt +@BINPATH@/browser/components/migration.xpt @BINPATH@/components/mimetype.xpt @BINPATH@/components/mozfind.xpt @BINPATH@/components/necko_about.xpt @@ -282,12 +284,12 @@ @BINPATH@/components/rdf.xpt @BINPATH@/components/satchel.xpt @BINPATH@/components/saxparser.xpt -@BINPATH@/components/sessionstore.xpt +@BINPATH@/browser/components/sessionstore.xpt @BINPATH@/components/services-crypto-component.xpt #ifdef MOZ_SERVICES_CAPTIVEDETECT @BINPATH@/components/services-captivedetect.xpt #endif -@BINPATH@/components/shellservice.xpt +@BINPATH@/browser/components/shellservice.xpt @BINPATH@/components/shistory.xpt @BINPATH@/components/spellchecker.xpt @BINPATH@/components/storage.xpt @@ -332,24 +334,24 @@ @BINPATH@/components/BrowserElementParent.js @BINPATH@/components/FeedProcessor.manifest @BINPATH@/components/FeedProcessor.js -@BINPATH@/components/BrowserFeeds.manifest -@BINPATH@/components/FeedConverter.js -@BINPATH@/components/FeedWriter.js -@BINPATH@/components/fuelApplication.manifest -@BINPATH@/components/fuelApplication.js -@BINPATH@/components/WebContentConverter.js -@BINPATH@/components/BrowserComponents.manifest -@BINPATH@/components/nsBrowserContentHandler.js -@BINPATH@/components/nsBrowserGlue.js -@BINPATH@/components/nsSetDefaultBrowser.manifest -@BINPATH@/components/nsSetDefaultBrowser.js -@BINPATH@/components/BrowserDownloads.manifest -@BINPATH@/components/DownloadsStartup.js -@BINPATH@/components/DownloadsUI.js -@BINPATH@/components/BrowserPlaces.manifest -@BINPATH@/components/BrowserPageThumbs.manifest -@BINPATH@/components/nsPrivateBrowsingServiceObsolete.manifest -@BINPATH@/components/nsPrivateBrowsingServiceObsolete.js +@BINPATH@/browser/components/BrowserFeeds.manifest +@BINPATH@/browser/components/FeedConverter.js +@BINPATH@/browser/components/FeedWriter.js +@BINPATH@/browser/components/fuelApplication.manifest +@BINPATH@/browser/components/fuelApplication.js +@BINPATH@/browser/components/WebContentConverter.js +@BINPATH@/browser/components/BrowserComponents.manifest +@BINPATH@/browser/components/nsBrowserContentHandler.js +@BINPATH@/browser/components/nsBrowserGlue.js +@BINPATH@/browser/components/nsSetDefaultBrowser.manifest +@BINPATH@/browser/components/nsSetDefaultBrowser.js +@BINPATH@/browser/components/BrowserDownloads.manifest +@BINPATH@/browser/components/DownloadsStartup.js +@BINPATH@/browser/components/DownloadsUI.js +@BINPATH@/browser/components/BrowserPlaces.manifest +@BINPATH@/browser/components/BrowserPageThumbs.manifest +@BINPATH@/browser/components/nsPrivateBrowsingServiceObsolete.manifest +@BINPATH@/browser/components/nsPrivateBrowsingServiceObsolete.js @BINPATH@/components/SiteSpecificUserAgent.js @BINPATH@/components/SiteSpecificUserAgent.manifest @BINPATH@/components/toolkitsearch.manifest @@ -376,8 +378,8 @@ @BINPATH@/components/NetworkGeolocationProvider.js @BINPATH@/components/GPSDGeolocationProvider.manifest @BINPATH@/components/GPSDGeolocationProvider.js -@BINPATH@/components/nsSidebar.manifest -@BINPATH@/components/nsSidebar.js +@BINPATH@/browser/components/nsSidebar.manifest +@BINPATH@/browser/components/nsSidebar.js @BINPATH@/components/extensions.manifest @BINPATH@/components/addonManager.js @BINPATH@/components/amContentHandler.js @@ -391,15 +393,15 @@ @BINPATH@/components/nsUpdateTimerManager.manifest @BINPATH@/components/nsUpdateTimerManager.js @BINPATH@/components/pluginGlue.manifest -@BINPATH@/components/nsSessionStore.manifest -@BINPATH@/components/nsSessionStartup.js -@BINPATH@/components/nsSessionStore.js +@BINPATH@/browser/components/nsSessionStore.manifest +@BINPATH@/browser/components/nsSessionStartup.js +@BINPATH@/browser/components/nsSessionStore.js @BINPATH@/components/nsURLFormatter.manifest @BINPATH@/components/nsURLFormatter.js #ifndef XP_OS2 -@BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@ +@BINPATH@/browser/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@ #else -@BINPATH@/components/brwsrcmp@DLL_SUFFIX@ +@BINPATH@/browser/components/brwsrcmp@DLL_SUFFIX@ #endif @BINPATH@/components/txEXSLTRegExFunctions.manifest @BINPATH@/components/txEXSLTRegExFunctions.js @@ -409,10 +411,10 @@ @BINPATH@/components/nsPlacesAutoComplete.manifest @BINPATH@/components/nsPlacesAutoComplete.js @BINPATH@/components/nsPlacesExpiration.js -@BINPATH@/components/PlacesProtocolHandler.js +@BINPATH@/browser/components/PlacesProtocolHandler.js @BINPATH@/components/PlacesCategoriesStarter.js @BINPATH@/components/ColorAnalyzer.js -@BINPATH@/components/PageThumbsProtocol.js +@BINPATH@/browser/components/PageThumbsProtocol.js @BINPATH@/components/nsDefaultCLH.manifest @BINPATH@/components/nsDefaultCLH.js @BINPATH@/components/nsContentPrefService.manifest @@ -446,21 +448,30 @@ @BINPATH@/components/DOMWifiManager.js @BINPATH@/components/DOMWifiManager.manifest #endif -@BINPATH@/components/BrowserProfileMigrators.manifest -@BINPATH@/components/ProfileMigrator.js -@BINPATH@/components/ChromeProfileMigrator.js -@BINPATH@/components/FirefoxProfileMigrator.js +@BINPATH@/browser/components/BrowserProfileMigrators.manifest +@BINPATH@/browser/components/ProfileMigrator.js +@BINPATH@/browser/components/ChromeProfileMigrator.js +@BINPATH@/browser/components/FirefoxProfileMigrator.js #ifdef XP_WIN -@BINPATH@/components/IEProfileMigrator.js -@BINPATH@/components/SafariProfileMigrator.js +@BINPATH@/browser/components/IEProfileMigrator.js +@BINPATH@/browser/components/SafariProfileMigrator.js #endif #ifdef XP_MACOSX -@BINPATH@/components/SafariProfileMigrator.js +@BINPATH@/browser/components/SafariProfileMigrator.js @BINPATH@/components/libalerts.dylib #endif #ifdef MOZ_ENABLE_DBUS @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@ #endif +#ifdef MOZ_ENABLE_GNOME_COMPONENT +@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@ +#endif +#ifdef MOZ_ENABLE_GNOMEVFS +@BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ +#endif +#if defined(XP_MACOSX) || defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT) || defined(MOZ_ENABLE_GNOMEVFS) +@BINPATH@/components/components.manifest +#endif @BINPATH@/components/nsINIProcessor.manifest @BINPATH@/components/nsINIProcessor.js @BINPATH@/components/nsPrompter.manifest @@ -519,6 +530,7 @@ #endif ; Modules +@BINPATH@/browser/modules/* @BINPATH@/modules/* ; Safe Browsing @@ -530,11 +542,6 @@ @BINPATH@/components/url-classifier.xpt #endif -; GNOME hooks -#ifdef MOZ_ENABLE_GNOME_COMPONENT -@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@ -#endif - ; ANGLE GLES-on-D3D rendering library #ifdef MOZ_ANGLE_RENDERER @BINPATH@/libEGL.dll @@ -543,38 +550,42 @@ #endif ; [Browser Chrome Files] -@BINPATH@/chrome/browser@JAREXT@ -@BINPATH@/chrome/browser.manifest -@BINPATH@/chrome/pdfjs.manifest -@BINPATH@/chrome/pdfjs/* -@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png +@BINPATH@/browser/chrome.manifest +@BINPATH@/browser/chrome/browser@JAREXT@ +@BINPATH@/browser/chrome/browser.manifest +@BINPATH@/browser/chrome/pdfjs.manifest +@BINPATH@/browser/chrome/pdfjs/* +@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png #ifdef SHIP_FEEDBACK -@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi +@BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest #ifdef MOZ_GTK2 -@BINPATH@/chrome/icons/default/default16.png -@BINPATH@/chrome/icons/default/default32.png -@BINPATH@/chrome/icons/default/default48.png +@BINPATH@/browser/chrome/icons/default/default16.png +@BINPATH@/browser/chrome/icons/default/default32.png +@BINPATH@/browser/chrome/icons/default/default48.png #endif ; shell icons #ifdef XP_UNIX #ifndef XP_MACOSX -@BINPATH@/icons/*.png +; shell icons +@BINPATH@/browser/icons/*.png +; updater icon +@BINPATH@/icons/updater.png #endif #endif ; [Default Preferences] ; All the pref files must be part of base to prevent migration bugs -@BINPATH@/@PREF_DIR@/firefox.js -@BINPATH@/@PREF_DIR@/firefox-branding.js +@BINPATH@/browser/@PREF_DIR@/firefox.js +@BINPATH@/browser/@PREF_DIR@/firefox-branding.js @BINPATH@/greprefs.js @BINPATH@/defaults/autoconfig/platform.js @BINPATH@/defaults/autoconfig/prefcalls.js -@BINPATH@/defaults/profile/prefs.js +@BINPATH@/browser/defaults/profile/prefs.js #ifndef LIBXUL_SDK ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) @@ -697,18 +708,12 @@ bin/libfreebl_32int64_3.so @BINPATH@/Throbber-small.gif #endif #endif -@BINPATH@/crashreporter-override.ini +@BINPATH@/browser/crashreporter-override.ini #ifdef MOZ_CRASHREPORTER_INJECTOR @BINPATH@/breakpadinjector.dll #endif #endif -; [Extensions] -; -#ifdef MOZ_ENABLE_GNOMEVFS -bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ -#endif - ; [OS/2] #ifdef XP_OS2 @BINPATH@/MozSounds.cmd diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 45ec61de90b..19e43e0d71d 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -130,7 +130,7 @@ locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) #ifdef MOZ_WEBAPP_RUNTIME -../webapprt/chrome/@AB_CD@.jar: +../../webapprt/chrome/@AB_CD@.jar: % locale webapprt @AB_CD@ %locale/webapprt/ locale/webapprt/webapp.dtd (%webapprt/webapp.dtd) locale/webapprt/webapp.properties (%webapprt/webapp.properties) diff --git a/browser/modules/test/unit/xpcshell.ini b/browser/modules/test/unit/xpcshell.ini index 2570d49e1ce..2d1cccf7309 100644 --- a/browser/modules/test/unit/xpcshell.ini +++ b/browser/modules/test/unit/xpcshell.ini @@ -1,5 +1,6 @@ [DEFAULT] head = tail = +firefox-appdir = browser [test_newtab-migrate-v1.js] diff --git a/services/common/tests/unit/xpcshell.ini b/services/common/tests/unit/xpcshell.ini index b5707d678e7..8fadd2b4185 100644 --- a/services/common/tests/unit/xpcshell.ini +++ b/services/common/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_global.js head_helpers.js head_http.js tail = +firefox-appdir = browser # Test load modules first so syntax failures are caught early. [test_load_modules.js] diff --git a/services/crypto/component/tests/unit/xpcshell.ini b/services/crypto/component/tests/unit/xpcshell.ini index 5b594f49159..83b61588823 100644 --- a/services/crypto/component/tests/unit/xpcshell.ini +++ b/services/crypto/component/tests/unit/xpcshell.ini @@ -1,5 +1,6 @@ [DEFAULT] head = tail = +firefox-appdir = browser [test_jpake.js] diff --git a/services/crypto/tests/unit/xpcshell.ini b/services/crypto/tests/unit/xpcshell.ini index 3455f13ba5a..2e4ebcaed4a 100644 --- a/services/crypto/tests/unit/xpcshell.ini +++ b/services/crypto/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_helpers.js ../../../common/tests/unit/head_helpers.js tail = +firefox-appdir = browser [test_load_modules.js] diff --git a/services/sync/tests/unit/xpcshell.ini b/services/sync/tests/unit/xpcshell.ini index 21bb66847cd..107a573aa7e 100644 --- a/services/sync/tests/unit/xpcshell.ini +++ b/services/sync/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_appinfo.js ../../../common/tests/unit/head_helpers.js head_helpers.js head_http_server.js tail = +firefox-appdir = browser # The manifest is roughly ordered from low-level to high-level. When making # systemic sweeping changes, this makes it easier to identify errors closer to diff --git a/toolkit/components/downloads/test/unit/xpcshell.ini b/toolkit/components/downloads/test/unit/xpcshell.ini index 39272abd196..ded33cfabe2 100644 --- a/toolkit/components/downloads/test/unit/xpcshell.ini +++ b/toolkit/components/downloads/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_download_manager.js tail = +firefox-appdir = browser [test_bug_382825.js] [test_bug_384744.js] diff --git a/toolkit/components/places/tests/autocomplete/xpcshell.ini b/toolkit/components/places/tests/autocomplete/xpcshell.ini index 220a62af600..e2a7fc2da34 100644 --- a/toolkit/components/places/tests/autocomplete/xpcshell.ini +++ b/toolkit/components/places/tests/autocomplete/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_autocomplete.js tail = +firefox-appdir = browser [test_416211.js] [test_416214.js] diff --git a/toolkit/components/places/tests/unit/xpcshell.ini b/toolkit/components/places/tests/unit/xpcshell.ini index ab11f7d6b10..c6cbd4c35ec 100644 --- a/toolkit/components/places/tests/unit/xpcshell.ini +++ b/toolkit/components/places/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_bookmarks.js tail = +firefox-appdir = browser [test_000_frecency.js] [test_317472.js] diff --git a/toolkit/components/search/tests/xpcshell/xpcshell.ini b/toolkit/components/search/tests/xpcshell/xpcshell.ini index 2bb5277729d..2b87abb5d27 100644 --- a/toolkit/components/search/tests/xpcshell/xpcshell.ini +++ b/toolkit/components/search/tests/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_search.js tail = +firefox-appdir = browser [test_nodb.js] [test_nodb_pluschanges.js] diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini index 7c00adc12bd..77049e2703c 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini +++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_addons.js tail = +firefox-appdir = browser [test_AddonRepository.js] # Bug 676992: test consistently hangs on Android