Merge mozilla-central to autoland. CLOSED TREE

browser/components/customizableui/test/browser_901207_searchbar_in_panel.js

@@ -8,7 +8,7 @@ logActiveElement();
 
 async function waitForSearchBarFocus() {
   let searchbar = document.getElementById("searchbar");
-  await waitForCondition(function() {
+  await TestUtils.waitForCondition(function() {
     logActiveElement();
     return document.activeElement === searchbar.textbox.inputField;
   });
@@ -65,7 +65,7 @@ add_task(async function check_shortcut_when_in_overflow() {
   Services.prefs.setBoolPref("browser.search.widget.inNavBar", true);
 
   window.resizeTo(kForceOverflowWidthPx, window.outerHeight);
-  await waitForCondition(() => {
+  await TestUtils.waitForCondition(() => {
     return (
       navbar.getAttribute("overflowing") == "true" &&
       !navbar.querySelector("#search-container")
@@ -81,7 +81,7 @@ add_task(async function check_shortcut_when_in_overflow() {
   await shownPanelPromise;
 
   let chevron = document.getElementById("nav-bar-overflow-button");
-  await waitForCondition(() => chevron.open);
+  await TestUtils.waitForCondition(() => chevron.open);
 
   await waitForSearchBarFocus();
 
@@ -93,7 +93,7 @@ add_task(async function check_shortcut_when_in_overflow() {
 
   navbar = document.getElementById(CustomizableUI.AREA_NAVBAR);
   window.resizeTo(this.originalWindowWidth, window.outerHeight);
-  await waitForCondition(() => !navbar.hasAttribute("overflowing"));
+  await TestUtils.waitForCondition(() => !navbar.hasAttribute("overflowing"));
   ok(
     !navbar.hasAttribute("overflowing"),
     "Should not have an overflowing toolbar."

security/mac/hardenedruntime/developer.entitlements.xml

@@ -23,11 +23,12 @@
     <!-- Code paged in from disk should match the signature at page-in time -->
     <key>com.apple.security.cs.disable-executable-page-protection</key><false/>
 
-    <!-- Do not allow loading unsigned libraries -->
-    <key>com.apple.security.cs.disable-library-validation</key><false/>
+    <!-- Allow loading third party libraries. Needed for Flash and CDMs -->
+    <key>com.apple.security.cs.disable-library-validation</key><true/>
 
     <!-- Allow dyld environment variables. Needed because Firefox uses
-         dyld variables to load libaries from within the .app bundle. -->
+         dyld variables (such as @executable_path) to load libaries from
+         within the .app bundle. -->
     <key>com.apple.security.cs.allow-dyld-environment-variables</key><true/>
 
     <!-- Allow debuggers to attach to running executables -->

security/mac/hardenedruntime/production.entitlements.xml

@@ -20,11 +20,12 @@
     <!-- Code paged in from disk should match the signature at page in-time -->
     <key>com.apple.security.cs.disable-executable-page-protection</key><false/>
 
-    <!-- Do not allow loading unsigned libraries -->
-    <key>com.apple.security.cs.disable-library-validation</key><false/>
+    <!-- Allow loading third party libraries. Needed for Flash and CDMs -->
+    <key>com.apple.security.cs.disable-library-validation</key><true/>
 
     <!-- Allow dyld environment variables. Needed because Firefox uses
-         dyld variables to load libaries from within the .app bundle. -->
+         dyld variables (such as @executable_path) to load libaries from
+         within the .app bundle. -->
     <key>com.apple.security.cs.allow-dyld-environment-variables</key><true/>
 
     <!-- Don't allow debugging of the executable. Debuggers will be prevented

taskcluster/scripts/misc/wrench-windows-tests.sh

@@ -12,7 +12,7 @@ cd $GECKO_PATH
 
 # This will download the rustc, MSVC, and wrench-deps artifacts.
 . taskcluster/scripts/misc/tooltool-download.sh
-export PATH=$PATH:$MOZ_FETCHES_DIR/rustc/bin
+export PATH=$PATH:$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin
 
 .  taskcluster/scripts/misc/vs-setup.sh
 

testing/web-platform/meta/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini

@@ -8,16 +8,7 @@
 
   [Https downgrade prefetch => No headers]
     bug: [https://bugzilla.mozilla.org/show_bug.cgi?id=1568717, https://bugzilla.mozilla.org/show_bug.cgi?id=1569098]
-    expected:
-      if (os == "linux") and not sw-e10s and debug and not webrender: [PASS, TIMEOUT, FAIL]
-      if (os == "linux") and sw-e10s: [FAIL, PASS, TIMEOUT]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [FAIL, PASS, TIMEOUT]
-      if (os == "linux") and not debug and (bits == 32): [PASS, TIMEOUT, FAIL]
-      if os == "win": [PASS, TIMEOUT, FAIL]
-      if os == "mac": [PASS, TIMEOUT, FAIL]
-      if (os == "android") and debug: [PASS, FAIL]
-      if (os == "android") and not debug: [PASS, FAIL]
-      FAIL
+    expected: [PASS, FAIL, TIMEOUT]
 
   [Https downgrade stylesheet => No headers]
     expected: TIMEOUT

testing/web-platform/meta/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html.ini

@@ -1,5 +1,5 @@
 [pointerevent_coordinates_when_locked.html]
   [mouse Test pointerevent coordinates when pointer is locked]
     expected:
-      if webrender and (os == "linux") and not debug: ["PASS", "FAIL"]
+      if webrender and (os == "linux"): ["PASS", "FAIL"]
 

testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini

@@ -1,6 +1,3 @@
 [pointerevent_movementxy_with_pointerlock.html]
   [mouse pointerevent movementX/Y with pointerlock test]
-    expected:
-      if webrender and (os == "win") and debug: FAIL
-      if not webrender and (os == "android") and debug: FAIL
-
+    expected: [PASS, FAIL]