accept path to firefox-bin on Mac OS X with -b flag

mozilla · Sep 10, 2010 · f3f6829 · f3f6829
1 parent d4712c2
commit f3f6829
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mozrunner/mozrunner/__init__.py b/mozrunner/mozrunner/__init__.py
@@ -329,7 +329,7 @@ def __init__(self, binary=None, profile=None, cmdargs=[], env=None,
                  aggressively_kill=['crashreporter'], kp_kwargs={}):
         if binary is None:
             self.binary = self.find_binary()
-        elif sys.platform == 'darwin':
+        elif sys.platform == 'darwin' and binary.find('Contents/MacOS/') == -1:
             self.binary = os.path.join(binary, 'Contents/MacOS/%s-bin' % self.names[0])
         else:
             self.binary = binary