Bug 670016 - Only append a -bin suffix if app-bin exists. This makes it possible to test Fennec on Mac. r=ted
authorJesse Ruderman <jruderman@gmail.com>
Fri, 09 Sep 2011 17:04:36 -0700
changeset 76853 2945d9f513628e7b28582d127fd3645ad1108d76
parent 76852 d18ca8ae27627fb64e661c0c8611573b936d772f
child 76854 4f7f1840152b3cc2645c60c9c9a972c287f2a009
push id1853
push userjruderman@mozilla.com
push dateSat, 10 Sep 2011 00:04:51 +0000
treeherdermozilla-inbound@2945d9f51362 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs670016
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 670016 - Only append a -bin suffix if app-bin exists. This makes it possible to test Fennec on Mac. r=ted
build/automation.py.in
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -787,20 +787,21 @@ user_pref("camino.use_system_proxy_setti
       fixerStatus = stackFixerProcess.wait()
       if fixerStatus != 0 and not didTimeout and not hitMaxTime:
         self.log.info("TEST-UNEXPECTED-FAIL | automation.py | Stack fixer process exited with code %d during test run", fixerStatus)
     return status
 
   def buildCommandLine(self, app, debuggerInfo, profileDir, testURL, extraArgs):
     """ build the application command line """
 
-    cmd = app
-    if self.IS_MAC and not self.IS_CAMINO and not cmd.endswith("-bin"):
+    cmd = os.path.abspath(app)
+    if self.IS_MAC and not self.IS_CAMINO and os.path.exists(cmd + "-bin"):
+      # Prefer 'app-bin' in case 'app' is a shell script.
+      # We can remove this hack once bug 673899 etc are fixed.
       cmd += "-bin"
-    cmd = os.path.abspath(cmd)
 
     args = []
 
     if debuggerInfo:
       args.extend(debuggerInfo["args"])
       args.append(cmd)
       cmd = os.path.abspath(debuggerInfo["path"])