Bug 568624 Running runtestsremote does not work on windows r=jmaher

testing/mochitest/runtestsremote.py

@@ -185,12 +185,12 @@ class RemoteOptions(MochitestOptions):
     def verifyRemoteOptions(self, options, automation):
         options.remoteTestRoot = automation._devicemanager.getDeviceRoot()
 
-        options.utilityPath = options.remoteTestRoot + "/bin"
         options.certPath = options.remoteTestRoot + "/certs"
 
-        if options.remoteWebServer == None and os.name != "nt":
+        if options.remoteWebServer == None:
+          if os.name != "nt":
             options.remoteWebServer = get_lan_ip()
-        elif os.name == "nt":
+          else:
             print "ERROR: you must specify a remoteWebServer ip address\n"
             return None
 
@@ -205,6 +205,9 @@ class RemoteOptions(MochitestOptions):
 
         # Set up our options that we depend on based on the above
         productRoot = options.remoteTestRoot + "/" + automation._product
+
+        # Set this only if the user hasn't set it
+        if (options.utilityPath == None):
           options.utilityPath = productRoot + "/bin"
 
         # If provided, use cli value, otherwise reset as remoteTestRoot