Commit 7b6ebf83 authored by Bogdan Tara's avatar Bogdan Tara
Browse files

Merge mozilla-central to mozilla-inbound. a=merge CLOSED TREE

parents 521937f6 0cd03d6d

browser/base/content/test/general/browser.ini

+0 −2
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ skip-if = toolkit != "cocoa" # Because of tests for supporting pasting from Serv 
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

skip-if = fission

[browser_bug575830.js]

skip-if = os == 'mac' # macosx1014 due to 1526628

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

[browser_bug577121.js]

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
@@ -324,7 +323,6 @@ skip-if = fission || os == 'win' # Bug 1384127 
support-files =

  refresh_header.sjs

  refresh_meta.sjs

skip-if = (os == 'mac') # permafail on macosx1014, see 1559410

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

[browser_relatedTabs.js]

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

browser/base/content/test/performance/browser.ini

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ skip-if = (verify && !debug && (os == 'win')) || (!debug && (os == 'win') && (bi 
[browser_tabswitch.js]

[browser_toolbariconcolor_restyles.js]

[browser_urlbar_keyed_search.js]

skip-if = (os == 'win' && bits == 32) || (os == 'mac') # Disabled on Win32 because of intermittent OOM failures (bug 1448241), macosx1014 due to 1565619

skip-if = (os == 'win' && bits == 32) # Disabled on Win32 because of intermittent OOM failures (bug 1448241).

[browser_urlbar_search.js]

skip-if = (debug || ccov) && (os == 'linux' || os == 'win') || (os == 'win' && bits == 32) # Disabled on Linux and Windows debug and ccov due to intermittent timeouts. Bug 1414126, bug 1426611. Disabled on Win32 because of intermittent OOM failures (bug 1448241)

[browser_window_resize.js]

browser/base/content/test/performance/io/browser.ini

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,5 @@ environment = 
  MOZ_PROFILER_STARTUP_FEATURES=js,mainthreadio

  MOZ_PROFILER_STARTUP_ENTRIES=10000000

[../browser_startup_mainthreadio.js]

skip-if = (os == 'mac') # macosx1014 due to 1554789, 1557221

[../browser_startup_content_mainthreadio.js]

[../browser_startup_syncIPC.js]
 
skip-if = (os == 'mac') # macosx1014 due to 1561940, 1562360

browser/base/content/test/permissions/browser.ini

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ support-files = 
  browser_autoplay_blocked_slow.sjs

  browser_autoplay_muted.html

  ../general/audio.ogg

skip-if = verify && os == 'linux' && debug || os == 'mac'# Bug 1483648, macosx1014 due to 1538602

skip-if = verify && os == 'linux' && debug # Bug 1483648

[browser_temporary_permissions_expiry.js]

[browser_temporary_permissions_navigation.js]

[browser_temporary_permissions_tabs.js]

browser/base/content/test/webrtc/browser.ini

+2 −7
Original line number Diff line number Diff line
@@ -4,22 +4,17 @@ support-files = 
  get_user_media_in_frame.html

  get_user_media_content_script.js

  head.js

; skip-if = os == 'mac' # multiple macosx1014 failures; 1259330, 1565738, 1567656, 1393761, 1567735



[browser_devices_get_user_media.js]

fail-if = os == 'mac' # macosx1014 fails due to 1259330

skip-if = fission || (os == "linux" && debug) # linux: bug 976544,

skip-if = fission || (os == "linux" && debug) # linux: bug 976544

[browser_devices_get_user_media_anim.js]

fail-if = os == 'mac' # macosx1014 permafail, see 1565738

[browser_devices_get_user_media_default_permissions.js]

fail-if = os == 'mac' # macosx1014 fails due to 1567656

[browser_devices_get_user_media_in_frame.js]

fail-if = os == 'mac' # macosx1014 due to 1567746

skip-if = debug # bug 1369731

[browser_devices_get_user_media_multi_process.js]

fail-if = fission

skip-if = debug && (os == "win" || os == "mac") # bug 1393761

[browser_devices_get_user_media_paused.js]

fail-if = os == 'mac' # macosx1014 due to 1567735

skip-if = (os == "win" && !debug) || (os =="linux" && !debug && bits == 64) #Bug 1440900

[browser_devices_get_user_media_screen.js]

skip-if = (os == 'linux') # Bug 1503991