Bug 1144393 - Use /storage/sdcard in preference to /sdcard for adb device root and enable test_file_equality.js; r=jmaher

testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py

@@ -472,8 +472,9 @@ class DeviceManagerADB(DeviceManager):
         # we must determine the device root ourselves
         paths = [('/storage/sdcard0', 'tests'),
                  ('/storage/sdcard1', 'tests'),
-                 ('/sdcard', 'tests'),
+                 ('/storage/sdcard', 'tests'),
                  ('/mnt/sdcard', 'tests'),
+                 ('/sdcard', 'tests'),
                  ('/data/local', 'tests')]
         for (basePath, subPath) in paths:
             if self.dirExists(basePath):

testing/xpcshell/remotexpcshelltests.py

@@ -231,7 +231,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.options = options
         self.device = devmgr
         self.pathMapping = []
-        self.remoteTestRoot = "%s/xpcshell" % self.device.deviceRoot
+        self.remoteTestRoot = "%s/xpc" % self.device.deviceRoot
         # remoteBinDir contains xpcshell and its wrapper script, both of which must
         # be executable. Since +x permissions cannot usually be set on /mnt/sdcard,
         # and the test root may be on /mnt/sdcard, remoteBinDir is set to be on

xpcom/tests/unit/xpcshell.ini

@@ -33,8 +33,6 @@ fail-if = os == "android"
 fail-if = os == "android"
 [test_file_createUnique.js]
 [test_file_equality.js]
-# Bug 1144393: fails consistently on Android 4.3 emulator
-fail-if = android_version == "18"
 [test_hidden_files.js]
 [test_home.js]
 # Bug 676998: test fails consistently on Android