Bug 681810 - Avoid xpcshell test failure when device not rooted and cp not available; r=jmaher

build/mobile/devicemanagerADB.py

@@ -13,6 +13,7 @@ class DeviceManagerADB(DeviceManager):
     self.retries = 0
     self._sock = None
     self.useRunAs = False
+    self.packageName = None
     if packageName == None:
       if os.getenv('USER'):
         packageName = 'org.mozilla.fennec_' + os.getenv('USER')

testing/xpcshell/remotexpcshelltests.py

@@ -195,7 +195,9 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         shellArgs = "cd "+self.remoteHere
         shellArgs += "; LD_LIBRARY_PATH="+self.remoteBinDir
         shellArgs += "; export CACHE_PATH="+self.remoteBinDir
-        shellArgs += "; export GRE_HOME="+self.device.getAppRoot()
+        if (self.device.getAppRoot()):
+          # xpcshell still runs without GRE_HOME; it may not be necessary
+          shellArgs += "; export GRE_HOME="+self.device.getAppRoot()
         shellArgs += "; export XPCSHELL_TEST_PROFILE_DIR="+self.profileDir
         shellArgs += "; "+xpcshell+" "
         shellArgs += " ".join(cmd[1:])