Add m-esr52 at 52.6.0

3 files changed, 46 insertions, 0 deletions

diff --git a/ipc/testshell/tests/test_ipcshell.js b/ipc/testshell/tests/test_ipcshell.js
new file mode 100644
index 000000000..60af07e34
--- /dev/null
+++ b/ipc/testshell/tests/test_ipcshell.js
@@ -0,0 +1,28 @@
+function callback(result) {
+  do_check_eq(result, Ci.nsIXULRuntime.PROCESS_TYPE_CONTENT);
+  do_test_finished();
+}
+
+function run_test() {
+  do_test_pending();
+
+  do_check_eq(runtime.processType, Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);
+
+  sendCommand("load('test_ipcshell_child.js');");
+
+  sendCommand("runtime.processType;", callback);
+
+  [ [ "C", "D" ], [ "D", "C" ], [ "\u010C", "D" ], [ "D", "\u010C" ] ].forEach(
+    function (pair) {
+      do_test_pending();
+      var cmp = pair[0].localeCompare(pair[1]);
+      sendCommand(
+          "'"+ pair[0] +"'.localeCompare('"+ pair[1] +"');",
+          function (result) {
+              do_check_eq(cmp, result);
+              do_test_finished(); 
+          });
+    })
+}
+load('test_ipcshell_child.js');
+
diff --git a/ipc/testshell/tests/test_ipcshell_child.js b/ipc/testshell/tests/test_ipcshell_child.js
new file mode 100644
index 000000000..d9c9fb6c0
--- /dev/null
+++ b/ipc/testshell/tests/test_ipcshell_child.js
@@ -0,0 +1,9 @@
+var Cc = Components.classes;

+var Ci = Components.interfaces;

+
+const runtime = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime);
+
+if (typeof(run_test) == "undefined") {

+  run_test = function() {
+    do_check_eq(runtime.processType, Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);

+  }
}
diff --git a/ipc/testshell/tests/xpcshell.ini b/ipc/testshell/tests/xpcshell.ini
new file mode 100644
index 000000000..26c22fb7b
--- /dev/null
+++ b/ipc/testshell/tests/xpcshell.ini
@@ -0,0 +1,9 @@
+[DEFAULT]
+head = 
+tail = 
+skip-if = toolkit == 'android'
+
+[test_ipcshell.js]
+# Bug 676963: test fails consistently on Android
+fail-if = os == "android"
+[test_ipcshell_child.js]