Merge pull request #764 from Benvie/bug837973

Bug 837973: Find Aurora binary on Windows r=@ochameau
mozilla · Feb 5, 2013 · 35f2826 · 35f2826
2 parents 9550fe3 + 7a2d1b6
commit 35f2826
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/python-lib/mozrunner/__init__.py b/python-lib/mozrunner/__init__.py
@@ -453,8 +453,10 @@ def find_binary(self):
                 if binary is None:
                     for bin in [(program_files, 'Mozilla Firefox', 'firefox.exe'),
                                 (os.environ.get("ProgramFiles(x86)"),'Mozilla Firefox', 'firefox.exe'),
-                                (program_files,'Nightly', 'firefox.exe'),
-                                (os.environ.get("ProgramFiles(x86)"),'Nightly', 'firefox.exe')
+                                (program_files, 'Nightly', 'firefox.exe'),
+                                (os.environ.get("ProgramFiles(x86)"),'Nightly', 'firefox.exe'),
+                                (program_files, 'Aurora', 'firefox.exe'),
+                                (os.environ.get("ProgramFiles(x86)"),'Aurora', 'firefox.exe')
                                 ]:
                         path = os.path.join(*bin)
                         if os.path.isfile(path):