diff --git a/README.md b/README.md index d8864411a72..531f90607f2 100644 --- a/README.md +++ b/README.md @@ -29,13 +29,13 @@ Please select your operating system: #### On OS X (homebrew) ``` sh -brew install automake pkg-config python cmake +brew install automake pkg-config python cmake yasm pip install virtualenv ``` #### On OS X (MacPorts) ``` sh -sudo port install python27 py27-virtualenv cmake +sudo port install python27 py27-virtualenv cmake yasm ``` #### On OS X >= 10.11 (El Capitan), you also have to install OpenSSL diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 0f2bff0232d..c4617d037fd 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1358,7 +1358,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#34c3e075138bb7eff2ed8b5924ccb9067dcd017e" +source = "git+https://github.com/servo/mozjs#f7917c480e3378441ee54c0554f6a3af9fb57464" dependencies = [ "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 8ae7e6c11cf..738ecebad6e 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1258,7 +1258,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#34c3e075138bb7eff2ed8b5924ccb9067dcd017e" +source = "git+https://github.com/servo/mozjs#f7917c480e3378441ee54c0554f6a3af9fb57464" dependencies = [ "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 084394e7ef9..48b748bd81c 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -7094,6 +7094,12 @@ "url": "/_mozilla/mozilla/load_event.html" } ], + "mozilla/localeCompare.html": [ + { + "path": "mozilla/localeCompare.html", + "url": "/_mozilla/mozilla/localeCompare.html" + } + ], "mozilla/mime_sniffing_font_context.html": [ { "path": "mozilla/mime_sniffing_font_context.html", diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.js b/tests/wpt/mozilla/tests/mozilla/interfaces.js index c6eeab6bdbc..1430f8cb81c 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.js +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.js @@ -20,6 +20,7 @@ function test_interfaces(interfaceNamesInGlobalScope) { "Int32Array", "Int8Array", "InternalError", + "Intl", "Iterator", "JSON", "Map", diff --git a/tests/wpt/mozilla/tests/mozilla/localeCompare.html b/tests/wpt/mozilla/tests/mozilla/localeCompare.html new file mode 100644 index 00000000000..c6042d8739e --- /dev/null +++ b/tests/wpt/mozilla/tests/mozilla/localeCompare.html @@ -0,0 +1,10 @@ + + +localeCompare should return the same as other browsers, even though it's implementation-dependent + + +