Bug 1168737 - specify runtime with command-line arg on Mac for tests; r=jmaher,marco

testing/mochitest/mach_commands.py

@@ -333,6 +333,10 @@ class MochitestRunner(MozbuildObject):
             if not options.app or options.app == self.get_binary_path():
                 options.app = self.get_webapp_runtime_path()
             options.xrePath = self.get_webapp_runtime_xre_path()
+            # On Mac, pass the path to the runtime, to ensure the test app
+            # uses that specific runtime instead of another one on the system.
+            if sys.platform.startswith('darwin'):
+                options.browserArgs.extend(('-runtime', os.path.join(self.distdir, self.substs['MOZ_MACBUNDLE_NAME'])))
 
         from manifestparser import TestManifest
         manifest = TestManifest()

toolkit/webapps/tests/test_webapp_runtime_executable_update.xul

@@ -53,7 +53,15 @@ let testAppInfo = new TestAppInfo(app);
 function runProcess() {
     let deferred = Promise.defer();
 
-    testAppInfo.appProcess.runAsync([], 0, (aSubject, aTopic) => {
+    let args = [];
+
+    if (MAC) {
+      // Set the -runtime flag to the test app's install path, which we're using
+      // as the "fake runtime" from which the test app updates its executable.
+      args.push("-runtime", testAppInfo.installPath);
+    }
+
+    testAppInfo.appProcess.runAsync(args, args.length, (aSubject, aTopic) => {
       if (aTopic == "process-finished") {
         deferred.resolve(aSubject.exitValue);
       } else if (aTopic == "process-failed") {
@@ -134,10 +142,6 @@ let runTest = Task.async(function*() {
   let stubExeFile = getFile(getTestFilePath(stubExeName));
   stubExeFile.copyTo(fakeInstallDir, exeName);
 
-  if (MAC) {
-    stubExeFile.copyTo(getFile(testAppInfo.installPath, "Contents", "MacOS"), "firefox-bin");
-  }
-
   testAppInfo.appProcess.init(exeFile);
 
   if (WIN) {

webapprt/mac/webapprt.mm

@@ -44,7 +44,7 @@ const char APP_RESOURCES_PATH[] = "/Contents/Resources/";
 //the path to the WebappRT subdir within the Firefox app contents dir
 const char WEBAPPRT_PATH[] = "webapprt/";
 
-void ExecNewBinary(NSString* launchPath);
+void ExecNewBinary(NSString* launchPath, NSDictionary* args);
 
 NSString *PathToWebRT(NSString* alternateBinaryID);
 
@@ -110,9 +110,15 @@ main(int argc, char **argv)
   NSLog(@"found override firefox binary: %@", alternateBinaryID);
 
   @try {
-    //find a webapprt binary to launch with.  throws an exception with error dialog if none found.
-    firefoxPath = PathToWebRT(alternateBinaryID);
-    NSLog(@"USING FIREFOX : %@", firefoxPath);
+    // Determine the runtime with which to run the application.
+    // Throws an exception with an error dialog if it can't find one.
+    firefoxPath = [args objectForKey:@"runtime"];
+    if (firefoxPath) {
+      NSLog(@"Runtime specified with -runtime flag: %@", firefoxPath);
+    } else {
+      firefoxPath = PathToWebRT(alternateBinaryID);
+      NSLog(@"Found runtime: %@", firefoxPath);
+    }
 
     NSString* myWebRTPath = [myBundle pathForResource:@"webapprt"
                                                ofType:nil];
@@ -198,7 +204,7 @@ main(int argc, char **argv)
       }
 
       //execv the new binary, and ride off into the sunset
-      ExecNewBinary(myWebRTPath);
+      ExecNewBinary(myWebRTPath, args);
 
     } else {
       //we are ready to load XUL and such, and go go go
@@ -267,7 +273,7 @@ main(int argc, char **argv)
 
         NSString *profile = [args objectForKey:@"profile"];
         if (profile) {
-          NSLog(@"Profile specified with --profile: %@", profile);
+          NSLog(@"Profile specified with -profile flag: %@", profile);
         }
         else {
           nsINIParser parser;
@@ -351,15 +357,6 @@ NSString
   //default is firefox
   NSString *binaryPath = nil;
 
-  // We're run from the Firefox bundle during WebappRT chrome and content tests.
-  NSString *myBundlePath = [[NSBundle mainBundle] bundlePath];
-  NSString *fxPath =
-    [NSString stringWithFormat:@"%@%sfirefox-bin", myBundlePath,
-                                                   APP_MACOS_PATH];
-  if ([[NSFileManager defaultManager] fileExistsAtPath:fxPath]) {
-    return myBundlePath;
-  }
-
   //we look for these flavors of Firefox, in this order
   NSArray* launchBinarySearchList = [NSArray arrayWithObjects: @"org.mozilla.nightly",
                                                                 @"org.mozilla.firefoxdeveloperedition",
@@ -389,12 +386,26 @@ NSString
 }
 
 void
-ExecNewBinary(NSString* launchPath)
+ExecNewBinary(NSString* launchPath, NSDictionary* args)
 {
   NSLog(@" launching webrt at path: %@\n", launchPath);
 
-  const char *const newargv[] = {[launchPath UTF8String], NULL};
+  NSUInteger numArgs = [args count];
+  const char *newargv[numArgs + 2];
+  NSMutableString *commandLine = [NSMutableString string];
+  newargv[0] = [launchPath UTF8String];
+  [commandLine appendString:launchPath];
 
-  NSLog(@"COMMAND LINE: '%@ %s'", launchPath, newargv[0]);
+  NSUInteger i = 1;
+  for (id key in args) {
+    NSString *name = [@"-" stringByAppendingString:key];
+    NSString *value = [args objectForKey:key];
+    newargv[i++] = [name UTF8String];
+    newargv[i++] = [value UTF8String];
+    [commandLine appendFormat:@" %@ %@", name, value];
+  }
+  newargv[i] = NULL;
+
+  NSLog(@"Command line: '%@'", commandLine);
   execv([launchPath UTF8String], (char **)newargv);
 }