Bug 1091109: Followup to avoid intermittent test failures on a CLOSED TREE. r=myk a=lmandel,RyanVM
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Thu, 06 Nov 2014 11:57:22 -0500
changeset 214406 2033324d4571a22d031696602d154970f6fa1e3e
parent 214405 037d1a9bc26abc0b229cc38b9d542de4e25066a5
child 214407 e228bf3b5f025ecca3201411958f00d4cea151c8
push id27780
push userkwierso@gmail.com
push dateFri, 07 Nov 2014 02:25:05 +0000
treeherdermozilla-central@e6d47abb6a7b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmyk, lmandel, RyanVM
bugs1091109
milestone36.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 1091109: Followup to avoid intermittent test failures on a CLOSED TREE. r=myk a=lmandel,RyanVM
webapprt/mac/webapprt.mm
--- a/webapprt/mac/webapprt.mm
+++ b/webapprt/mac/webapprt.mm
@@ -163,20 +163,28 @@ main(int argc, char **argv)
 
       NSFileManager* fileClerk = [[NSFileManager alloc] init];
       NSError *errorDesc = nil;
 
       //we know the firefox path, so copy the new webapprt here
       NSString *newWebRTPath =
         [NSString stringWithFormat: @"%@%s%s", firefoxPath, APP_RESOURCES_PATH,
                                                WEBAPPRT_EXECUTABLE];
-      NSLog(@"### Firefox webapprt path: %@", newWebRTPath);
+      NSLog(@"### Trying Firefox webapprt path: %@", newWebRTPath);
       if (![fileClerk fileExistsAtPath:newWebRTPath]) {
-        NSString* msg = [NSString stringWithFormat: @"This version of Firefox (%@) cannot run web applications, because it is not recent enough or damaged", firefoxVersion];
-        @throw MakeException(@"Missing Web Runtime Files", msg);
+        newWebRTPath =
+          [NSString stringWithFormat: @"%@%s%s", firefoxPath, APP_MACOS_PATH,
+                                                 WEBAPPRT_EXECUTABLE];
+        NSLog(@"### Trying Firefox webapprt path: %@", newWebRTPath);
+        if (![fileClerk fileExistsAtPath:newWebRTPath]) {
+          NSString* msg =
+            [NSString stringWithFormat:
+              @"This version of Firefox (%@) cannot run web applications, because it is not recent enough or damaged", firefoxVersion];
+          @throw MakeException(@"Missing Web Runtime Files", msg);
+        }
       }
 
       [fileClerk removeItemAtPath: myWebRTPath error: &errorDesc];
       if (errorDesc != nil) {
         NSLog(@"failed to unlink old binary file at path: %@ with error: %@", myWebRTPath, errorDesc);
         @throw MakeException(@"Unable To Update", @"Failed preparation for Web Runtime update");
       }