Bug 1286016 - Re-organize browser.ini manifests to reflect support files needed by tests in toolkit/mozapps/extensions/test/browser/browser.ini r=erahm
authorChris Manchester <cmanchester@mozilla.com>
Wed, 20 Jul 2016 11:47:22 -0700
changeset 345881 8d4f43219dcfeb6b102f974e2617a31c1745a989
parent 345880 9c84392108d91ea0a598b13e0acfd6b086e2952a
child 345882 e25f1a122d9dc433d907ec2d1a6c9108cb3fbec0
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerserahm
bugs1286016
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1286016 - Re-organize browser.ini manifests to reflect support files needed by tests in toolkit/mozapps/extensions/test/browser/browser.ini r=erahm MozReview-Commit-ID: Kfn3ApOTXOk
toolkit/mozapps/extensions/test/browser/browser-common.ini
toolkit/mozapps/extensions/test/browser/browser-window.ini
toolkit/mozapps/extensions/test/browser/browser.ini
--- a/toolkit/mozapps/extensions/test/browser/browser-common.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser-common.ini
@@ -1,58 +1,8 @@
-[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]
 skip-if = os == 'win' && !debug # Disabled on Windows opt/PGO builds due to intermittent failures (bug 1135866)
--- a/toolkit/mozapps/extensions/test/browser/browser-window.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser-window.ini
@@ -1,4 +1,52 @@
 [DEFAULT]
 install-to-subdir = test-window
+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
 
 [include:browser-common.ini]
--- a/toolkit/mozapps/extensions/test/browser/browser.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser.ini
@@ -1,11 +1,59 @@
 [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]