Auto merge of #13836 - emilio:js-intl, r=Ms2ger

Update mozjs_sys to expose proper locale callbacks.  ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13788 (github issue number if applicable).  - [ ] There are tests for these changes OR  Fixes #13788  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13836)
servo · Oct 25, 2016 · c8321ed · c8321ed
2 parents a9715c1 + 60e0ccf
commit c8321ed
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git 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
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
diff --git 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
@@ -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
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>localeCompare should return the same as other browsers, even though it's implementation-dependent</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  assert_equals("ab".localeCompare("aZ"), -1);
+})
+</script>