Merge inbound to mozilla-central r=merge a=merge
authorCsoregi Natalia <ncsoregi@mozilla.com>
Thu, 28 Dec 2017 23:37:20 +0200
changeset 397483 f0f170bd40e84daeae7eeb3f658a34d05a968d75
parent 397473 1d36f8fe2e0ec1e4190d87e049ebfbbae6a05d03 (current diff)
parent 397482 86ec6a8d57046f3d1d7526e698195e71056e4dcc (diff)
child 397489 fee5e6b9187c13841cb4c33391a77f6a10f60a9f
push id33162
push userncsoregi@mozilla.com
push dateThu, 28 Dec 2017 21:37:53 +0000
treeherdermozilla-central@f0f170bd40e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge, merge
milestone59.0a1
first release with
nightly linux32
f0f170bd40e8 / 59.0a1 / 20171228220110 / files
nightly linux64
f0f170bd40e8 / 59.0a1 / 20171228220110 / files
nightly mac
f0f170bd40e8 / 59.0a1 / 20171228220110 / files
nightly win32
f0f170bd40e8 / 59.0a1 / 20171228220110 / files
nightly win64
f0f170bd40e8 / 59.0a1 / 20171228220110 / 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 r=merge a=merge
--- a/browser/base/content/test/alerts/browser.ini
+++ b/browser/base/content/test/alerts/browser.ini
@@ -9,8 +9,9 @@ skip-if = os == 'win' # Bug 1227785
 skip-if = os == 'win' # Bug 1352791
 [browser_notification_open_settings.js]
 skip-if = os == 'win' # Bug 1411118
 [browser_notification_remove_permission.js]
 skip-if = os == 'win' # Bug 1411118
 [browser_notification_replace.js]
 skip-if = os == 'win' # Bug 1422928
 [browser_notification_tab_switching.js]
+skip-if = os == 'win' # Bug 1243263
--- a/js/src/jit/mips-shared/Assembler-mips-shared.h
+++ b/js/src/jit/mips-shared/Assembler-mips-shared.h
@@ -621,17 +621,17 @@ class GSImm13
     uint16_t value;
 
   public:
     GSImm13();
     GSImm13(uint32_t imm)
       : value(imm & ~0xf)
     { }
     uint32_t encode(uint32_t shift) {
-        return ((value >> 4) & 0x1f) << shift;
+        return ((value >> 4) & 0x1ff) << shift;
     }
     int32_t decodeSigned() {
         return value;
     }
     uint32_t decodeUnsigned() {
         return value;
     }
     static bool IsInRange(int32_t imm) {
--- a/toolkit/components/contextualidentity/tests/unit/test_migration2to3.js
+++ b/toolkit/components/contextualidentity/tests/unit/test_migration2to3.js
@@ -2,16 +2,17 @@
 
 const profileDir = do_get_profile();
 
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Cu.import("resource://gre/modules/ContextualIdentityService.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/AppConstants.jsm");
 
 const TEST_STORE_FILE_PATH = OS.Path.join(profileDir.path, "test-containers.json");
 
 const BASE_URL = "http://example.org/";
 
 const COOKIE = {
   host: BASE_URL,
   path: "/",
@@ -96,24 +97,30 @@ add_task(async function cookieDeleted() 
 
   let cis = ContextualIdentityService.createNewInstanceForTesting(TEST_STORE_FILE_PATH);
   ok(!!cis, "We have our instance of ContextualIdentityService");
 
   equal(cis.getPublicIdentities().length, 1, "The test file containes 1 identity");
   ok(!!cis.getPublicIdentityFromId(1), "Identity 1 exists");
 
   // Cookie is gone!
-  ok(!hasCookie(), "We should not have the new cookie!");
+  if (AppConstants.NIGHTLY_BUILD) {
+    ok(!hasCookie(), "We should not have the new cookie!");
+  } else {
+    ok(hasCookie(), "We should have the cookies in release/beta!");
+  }
 
   // Let's force the saving.
   await cis.save();
 
   // Let's be sure that the cookie is not deleted again.
-  createCookie();
-  ok(hasCookie(), "We have the new cookie!");
+  if (AppConstants.NIGHTLY_BUILD) {
+    createCookie();
+    ok(hasCookie(), "We have the new cookie!");
+  }
 
   cis = ContextualIdentityService.createNewInstanceForTesting(TEST_STORE_FILE_PATH);
   ok(!!cis, "We have our instance of ContextualIdentityService");
 
   equal(cis.getPublicIdentities().length, 1, "The test file containes 1 identity");
 
   ok(hasCookie(), "Cookie is not deleted when the file is reopened");
 });
--- a/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini
+++ b/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini
@@ -1,10 +1,10 @@
 [test_ext_i18n.js]
-skip-if = os == "android" || (os == "win" && debug)
+skip-if = os == "android" || (os == "win" && debug) || (os == "linux")
 [test_ext_i18n_css.js]
 [test_ext_contentscript.js]
 [test_ext_contentscript_scriptCreated.js]
 skip-if = debug # Bug 1407501
 [test_ext_contentscript_triggeringPrincipal.js]
 skip-if = os == "android" && debug
 [test_ext_contentscript_xrays.js]
 [test_ext_contentScripts_register.js]
--- a/toolkit/components/passwordmgr/test/browser/browser.ini
+++ b/toolkit/components/passwordmgr/test/browser/browser.ini
@@ -10,16 +10,17 @@ support-files =
   form_cross_origin_insecure_action.html
   head.js
   insecure_test.html
   insecure_test_subframe.html
   multiple_forms.html
   streamConverter_content.sjs
 
 [browser_autocomplete_insecure_warning.js]
+skip-if = os == "linux" || os == "mac"  # Bug 1425879
 [browser_capture_doorhanger.js]
 skip-if = os == "linux" && debug # Bug 1334336
 support-files =
   subtst_notifications_1.html
   subtst_notifications_2.html
   subtst_notifications_2pw_0un.html
   subtst_notifications_2pw_1un_1text.html
   subtst_notifications_3.html