Add support for setting environment variables that are used when the simulated

testing/iossim/iossim.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Foundation/Foundation.h>
 #include <asl.h>
 #include <libgen.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ skipping 261 matching lines @@
   return systemRoot;
 }
 
 // Builds a config object for starting the specified app.
 DTiPhoneSimulatorSessionConfig* BuildSessionConfig(
     DTiPhoneSimulatorApplicationSpecifier* appSpec,
     DTiPhoneSimulatorSystemRoot* systemRoot,
     NSString* stdoutPath,
     NSString* stderrPath,
     NSArray* appArgs,
+    NSDictionary* appEnv,
     NSNumber* deviceFamily) {
   DTiPhoneSimulatorSessionConfig* sessionConfig =
       [[[DTiPhoneSimulatorSessionConfig alloc] init] autorelease];
   sessionConfig.applicationToSimulateOnStart = appSpec;
   sessionConfig.simulatedSystemRoot = systemRoot;
   sessionConfig.localizedClientName = @"chromium";
   sessionConfig.simulatedApplicationStdErrPath = stderrPath;
   sessionConfig.simulatedApplicationStdOutPath = stdoutPath;
   sessionConfig.simulatedApplicationLaunchArgs = appArgs;
-  // TODO(lliabraa): Add support for providing environment variables/values
-  // for the simulated app's environment. The environment can be set using:
-  // sessionConfig.simulatedApplicationLaunchEnvironment =
-  //     [NSDictionary dictionary];
+  sessionConfig.simulatedApplicationLaunchEnvironment = appEnv;
   sessionConfig.simulatedDeviceFamily = deviceFamily;
   return sessionConfig;
 }
 
 // Builds a simulator session that will use the given delegate.
 DTiPhoneSimulatorSession* BuildSession(SimulatorDelegate* delegate) {
   DTiPhoneSimulatorSession* session =
       [[[DTiPhoneSimulatorSession alloc] init] autorelease];
   session.delegate = delegate;
   return session;
@@ skipping 62 matching lines @@
     LogError(@"Unable to set environment variables for home directory.");
     return NO;
   }
 
   return YES;
 }
 
 // Prints the usage information to stderr.
 void PrintUsage() {
   fprintf(stderr, "Usage: iossim [-d device] [-s sdkVersion] [-u homeDir] "
-      "<appPath> [<appArgs>]\n"
+      "[-e envKey=value]* <appPath> [<appArgs>]\n"
       "  where <appPath> is the path to the .app directory and appArgs are any"
       " arguments to send the simulated app.\n"
       "\n"
       "Options:\n"
       "  -d  Specifies the device (either 'iPhone' or 'iPad')."
       " Defaults to 'iPhone'.\n"
       "  -s  Specifies the SDK version to use (e.g '4.3')."
       " Will use system default if not specified.\n"
       "  -u  Specifies a user home directory for the simulator."
-      " Will create a new directory if not specified.\n");
+      " Will create a new directory if not specified.\n"
+      "  -e  Specifies a environment key:value pair that will be"

[lliabraa, 2012/07/27 17:00:19]

s/a/an/

[TVL, 2012/07/27 17:04:35]

Done.

+      " set when the application is launched in the simulator.\n");

[lliabraa, 2012/07/27 17:00:19]

I think this could be a little more clear (e.g. "...set in the simulated
application's environment") so that it's clear that the variable is set in the
app's environment, not iOS Simulator's.

[TVL, 2012/07/27 17:04:35]

Done.

 }
 
 }  // namespace
 
 int main(int argc, char* const argv[]) {
   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
 
   char* toolName = basename(argv[0]);
   if (toolName != NULL)
     gToolName = toolName;
 
   NSString* appPath = nil;
   NSString* appName = nil;
   NSString* sdkVersion = nil;
   NSString* deviceName = @"iPhone";
   NSString* simHomePath = nil;
   NSMutableArray* appArgs = [NSMutableArray array];
+  NSMutableDictionary* appEnv = [NSMutableDictionary dictionary];
 
   // Parse the optional arguments
   int c;
-  while ((c = getopt(argc, argv, "hs:d:u:")) != -1) {
+  while ((c = getopt(argc, argv, "hs:d:u:e:")) != -1) {
     switch (c) {
       case 's':
         sdkVersion = [NSString stringWithUTF8String:optarg];
         break;
       case 'd':
         deviceName = [NSString stringWithUTF8String:optarg];
         break;
       case 'u':
         simHomePath = [[NSFileManager defaultManager]
             stringWithFileSystemRepresentation:optarg length:strlen(optarg)];
         break;
+      case 'e': {
+        NSString* envLine = [NSString stringWithUTF8String:optarg];
+        NSRange range = [envLine rangeOfString:@"="];
+        if (range.location == NSNotFound) {
+          LogError(@"Invalid key=value line for -e.");

[lliabraa, 2012/07/27 17:00:19]

s/line/argument

[TVL, 2012/07/27 17:04:35]

Done.

+          PrintUsage();
+          exit(EXIT_FAILURE);
+        }
+        NSString* key = [envLine substringToIndex:range.location];
+        NSString* value = [envLine substringFromIndex:(range.location + 1)];
+        [appEnv setObject:value forKey:key];
+      }
+        break;
       case 'h':
         PrintUsage();
         exit(EXIT_SUCCESS);
       default:
         PrintUsage();
         exit(EXIT_FAILURE);
     }
   }
 
   // There should be at least one arg left, specifying the app path. Any
@@ skipping 59 matching lines @@
              simHomePath);
     exit(EXIT_FAILURE);
   }
 
   // Create the config and simulator session.
   DTiPhoneSimulatorSessionConfig* config = BuildSessionConfig(appSpec,
                                                               systemRoot,
                                                               stdioPath,
                                                               stdioPath,
                                                               appArgs,
+                                                              appEnv,
                                                               deviceFamily);
   SimulatorDelegate* delegate =
   [[[SimulatorDelegate alloc] initWithStdioPath:stdioPath] autorelease];
   DTiPhoneSimulatorSession* session = BuildSession(delegate);
 
   // Start the simulator session.
   NSError* error;
   BOOL started = [session requestStartWithConfig:config
                                          timeout:kSessionStartTimeoutSeconds
                                            error:&error];
 
   // Spin the runtime indefinitely. When the delegate gets the message that the
   // app has quit it will exit this program.
   if (started)
     [[NSRunLoop mainRunLoop] run];
   else
     LogError(@"Simulator failed to start: %@", [error localizedDescription]);
 
   // Note that this code is only executed if the simulator fails to start
   // because once the main run loop is started, only the delegate calling
   // exit() will end the program.
   [pool drain];
   return EXIT_FAILURE;
 }