diff --git a/toolkit/webapps/tests/chrome.ini b/toolkit/webapps/tests/chrome.ini index 52173a7a2e7f..774b4b142c31 100644 --- a/toolkit/webapps/tests/chrome.ini +++ b/toolkit/webapps/tests/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'mulet' || os == "mac" # see bug 993690 and bug 1076941 +skip-if = buildapp == 'mulet' || os == "mac" && os_version == "10.6" # see bug 993690 support-files = head.js app.sjs diff --git a/webapprt/mac/webapprt.mm b/webapprt/mac/webapprt.mm index 0c54cebc37df..f0c4eb9c1a13 100644 --- a/webapprt/mac/webapprt.mm +++ b/webapprt/mac/webapprt.mm @@ -117,7 +117,13 @@ main(int argc, char **argv) NSString* myWebRTPath = [myBundle pathForResource:@"webapprt" ofType:nil]; if (!myWebRTPath) { - @throw MakeException(@"Missing Web Runtime Files", @"Cannot locate binary for this App"); + myWebRTPath = [myBundlePath stringByAppendingPathComponent:@"Contents"]; + myWebRTPath = [myWebRTPath stringByAppendingPathComponent:@"MacOS"]; + myWebRTPath = [myWebRTPath stringByAppendingPathComponent:@"webapprt"]; + if ([[NSFileManager defaultManager] fileExistsAtPath:myWebRTPath] == NO) { + @throw MakeException(@"Missing Web Runtime Files", + @"Cannot locate binary for this App"); + } } //GET FIREFOX BUILD ID