Merge m-c to inbound.

build/mobile/b2gautomation.py

@@ -85,7 +85,7 @@ class B2GRemoteAutomation(Automation):
         active = False
         time_out = 0
         while not active and time_out < 40:
-            data = self._devicemanager.runCmd(['shell', '/system/bin/netcfg']).stdout.readlines()
+            data = self._devicemanager._runCmd(['shell', '/system/bin/netcfg']).stdout.readlines()
             data.pop(0)
             for line in data:
                 if (re.search(r'UP\s+(?:[0-9]{1,3}\.){3}[0-9]{1,3}', line)):
@@ -156,7 +156,7 @@ class B2GRemoteAutomation(Automation):
         serial = serial or self._devicemanager.deviceSerial
         status = 'unknown'
 
-        for line in self._devicemanager.runCmd(['devices']).stdout.readlines():
+        for line in self._devicemanager._runCmd(['devices']).stdout.readlines():
             result =  re.match('(.*?)\t(.*)', line)
             if result:
                 thisSerial = result.group(1)
@@ -181,7 +181,7 @@ class B2GRemoteAutomation(Automation):
         serial, status = self.getDeviceStatus()
 
         # reboot!
-        self._devicemanager.runCmd(['shell', '/system/bin/reboot'])
+        self._devicemanager._runCmd(['shell', '/system/bin/reboot'])
 
         # The above command can return while adb still thinks the device is
         # connected, so wait a little bit for it to disconnect from adb.
@@ -221,7 +221,7 @@ class B2GRemoteAutomation(Automation):
                                 " prior to running before running the automation framework")
 
         # stop b2g
-        self._devicemanager.runCmd(['shell', 'stop', 'b2g'])
+        self._devicemanager._runCmd(['shell', 'stop', 'b2g'])
         time.sleep(5)
 
         # relaunch b2g inside b2g instance

build/valgrind/cross-architecture.sup

@@ -55,11 +55,11 @@
    ...
 }
 {
-   Bug 793533
+   Bug 793533 (all 64-bit systems)
    Memcheck:Leak
    fun:malloc
    fun:moz_xmalloc
-   fun:_Z22xpc_CreateGlobalObjectP9JSContextP7JSClassP12nsIPrincipalP11nsISupportsbPP8JSObjectPP13JSCompartment
+   fun:_ZN3xpc18CreateGlobalObjectEP9JSContextP7JSClassP12nsIPrincipalbPP8JSObjectPP13JSCompartment
    ...
 }
 {

layout/style/test/ccd.sjs

@@ -61,17 +61,13 @@ function handleRequest(request, response)
 	response.write(selector + '{}\n');
     } else {
 	// Normal operation.
-        let contentType = responseCSS ? 'text/css' : 'text/html';
-        let responseBody = (leader + selector +
-	                    '{background-color:' + color + '}' +
-		            trailer + '\n');
-        dump("TEST-INFO | ccd.sjs | " + request.queryString + " | " +
-             contentType + " | " + (httpError ? '500' : '200') + " | " +
-             responseBody);
 	if (httpError)
 	    response.setStatusLine(request.httpVersion, 500,
 				   "Internal Server Error");
-        response.setHeader('Content-Type', contentType);
-	response.write(responseBody);
+	response.setHeader('Content-Type',
+			   responseCSS ? 'text/css' : 'text/html');
+	response.write(leader + selector +
+		       '{background-color:' + color + '}' +
+		       trailer + '\n');
     }
 }

testing/mochitest/runtestsb2g.py

@@ -215,9 +215,9 @@ class B2GMochitest(Mochitest):
 
     def copyRemoteFile(self, src, dest):
         if self._dm.useDDCopy:
-            self._dm.checkCmdAs(['shell', 'dd', 'if=%s' % src,'of=%s' % dest])
+            self._dm._checkCmdAs(['shell', 'dd', 'if=%s' % src,'of=%s' % dest])
         else:
-            self._dm.checkCmdAs(['shell', 'cp', src, dest])
+            self._dm._checkCmdAs(['shell', 'cp', src, dest])
 
     def origUserJSExists(self):
         return self._dm.fileExists('/data/local/user.js.orig')
@@ -229,7 +229,7 @@ class B2GMochitest(Mochitest):
 
         if not options.emulator:
             # Remove the test profile
-            self._dm.checkCmdAs(['shell', 'rm', '-r', self.remoteProfile])
+            self._dm._checkCmdAs(['shell', 'rm', '-r', self.remoteProfile])
 
             if self.origUserJSExists():
                 # Restore the original user.js
@@ -387,7 +387,7 @@ user_pref("network.dns.localDomains","app://system.gaiamobile.org");\n
         f.close()
 
         # Copy the profile to the device.
-        self._dm.checkCmdAs(['shell', 'rm', '-r', self.remoteProfile])
+        self._dm._checkCmdAs(['shell', 'rm', '-r', self.remoteProfile])
         if self._dm.pushDir(options.profilePath, self.remoteProfile) == None:
             raise devicemanager.FileError("Unable to copy profile to device.")