Bug 1285618 - Move support files to browser-common.ini so that running individual addon manager tests installs them properly. r?gps
MozReview-Commit-ID: FRslpRvJFK9
--- a/toolkit/mozapps/extensions/test/browser/browser-common.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser-common.ini
@@ -1,11 +1,57 @@
[DEFAULT]
support-files =
+ addons/*
+ addon_about.xul
+ addon_prefs.xul
+ cancelCompatCheck.sjs
+ discovery.html
+ discovery_frame.html
+ discovery_install.html
head.js
+ signed_hotfix.rdf
+ signed_hotfix.xpi
+ unsigned_hotfix.rdf
+ unsigned_hotfix.xpi
+ more_options.xul
+ options.xul
+ plugin_test.html
+ redirect.sjs
+ releaseNotes.xhtml
+ blockNoPlugins.xml
+ blockPluginHard.xml
+ browser_bug557956.rdf
+ browser_bug557956_8_2.xpi
+ browser_bug557956_9_2.xpi
+ browser_bug557956.xml
+ browser_bug591465.xml
+ browser_bug593535.xml
+ browser_searching.xml
+ browser_searching_empty.xml
+ browser_updatessl.rdf
+ browser_updatessl.rdf^headers^
+ browser_install.rdf
+ browser_install.rdf^headers^
+ browser_install.xml
+ browser_install1_3.xpi
+ browser_eula.xml
+ browser_purchase.xml
+ webapi_addon_listener.html
+ webapi_checkavailable.html
+ webapi_checkchromeframe.xul
+ webapi_checkframed.html
+ webapi_checknavigatedwindow.html
+ !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi
+ !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi
+ !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
+ !/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi
+ !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi
+ !/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi
+ !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
[browser_about.js]
skip-if = os == 'linux' || os == 'win' # bug 632290
[browser_bug523784.js]
[browser_bug557943.js]
[browser_bug562797.js]
[browser_bug562854.js]
[browser_bug562890.js]
--- a/toolkit/mozapps/extensions/test/browser/browser.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser.ini
@@ -1,59 +1,11 @@
[DEFAULT]
skip-if = buildapp == 'mulet'
tags = addons
-support-files =
- addons/*
- addon_about.xul
- addon_prefs.xul
- cancelCompatCheck.sjs
- discovery.html
- discovery_frame.html
- discovery_install.html
- head.js
- signed_hotfix.rdf
- signed_hotfix.xpi
- unsigned_hotfix.rdf
- unsigned_hotfix.xpi
- more_options.xul
- options.xul
- plugin_test.html
- redirect.sjs
- releaseNotes.xhtml
- blockNoPlugins.xml
- blockPluginHard.xml
- browser_bug557956.rdf
- browser_bug557956_8_2.xpi
- browser_bug557956_9_2.xpi
- browser_bug557956.xml
- browser_bug591465.xml
- browser_bug593535.xml
- browser_searching.xml
- browser_searching_empty.xml
- browser_updatessl.rdf
- browser_updatessl.rdf^headers^
- browser_install.rdf
- browser_install.rdf^headers^
- browser_install.xml
- browser_install1_3.xpi
- browser_eula.xml
- browser_purchase.xml
- webapi_addon_listener.html
- webapi_checkavailable.html
- webapi_checkchromeframe.xul
- webapi_checkframed.html
- webapi_checknavigatedwindow.html
- !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi
- !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi
- !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
- !/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi
- !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi
- !/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi
- !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
[browser_addonrepository_performance.js]
[browser_bug557956.js]
[browser_bug616841.js]
[browser_cancelCompatCheck.js]
[browser_checkAddonCompatibility.js]
[browser_gmpProvider.js]
[browser_hotfix.js]