Merge inbound to mozilla-central. a=merge
authorBrindusan Cristian <cbrindusan@mozilla.com>
Sun, 03 Feb 2019 23:41:43 +0200
changeset 514473 28c742617296
parent 514471 be2f62a541cb (current diff)
parent 514472 55bcbbc35154 (diff)
child 514477 a62c6b273d4a
child 514515 b2d43c9e4682
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone67.0a1
first release with
nightly linux32
28c742617296 / 67.0a1 / 20190203214209 / files
nightly linux64
28c742617296 / 67.0a1 / 20190203214209 / files
nightly mac
28c742617296 / 67.0a1 / 20190203214209 / files
nightly win32
28c742617296 / 67.0a1 / 20190203214209 / files
nightly win64
28c742617296 / 67.0a1 / 20190203214209 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
--- a/browser/base/content/test/permissions/browser.ini
+++ b/browser/base/content/test/permissions/browser.ini
@@ -1,14 +1,15 @@
 [DEFAULT]
 support-files=
   head.js
   permissions.html
 
 [browser_canvas_fingerprinting_resistance.js]
+skip-if = debug || os == "linux" && asan # Bug 1522069
 [browser_permissions.js]
 [browser_reservedkey.js]
 [browser_temporary_permissions.js]
 support-files =
   temporary_permissions_subframe.html
   ../webrtc/get_user_media.html
 [browser_autoplay_blocked.js]
 support-files =