Make iossim binary work on Xcode 5 and 6.

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 83 matching lines @@
 // If this timeout occurs iossim will likely exit with non-zero status; the
 // exception being if the app is invoked and completes execution before the
 // session is started (this case is handled in session:didStart:withError).
 const NSTimeInterval kDefaultSessionStartTimeoutSeconds = 30;
 
 // While the simulated app is running, its stdout is redirected to a file which
 // is polled by iossim and written to iossim's stdout using the following
 // polling interval.
 const NSTimeInterval kOutputPollIntervalSeconds = 0.1;
 
-// The path within the developer dir of the private Simulator frameworks.
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
-#if defined(IOSSIM_USE_XCODE_6)
-NSString* const kSimulatorFrameworkRelativePath =
-    @"../SharedFrameworks/DVTiPhoneSimulatorRemoteClient.framework";
-NSString* const kCoreSimulatorRelativePath =
-    @"Library/PrivateFrameworks/CoreSimulator.framework";
-#else
-NSString* const kSimulatorFrameworkRelativePath =
-    @"Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/"
-    @"DVTiPhoneSimulatorRemoteClient.framework";
-#endif  // IOSSIM_USE_XCODE_6
 NSString* const kDVTFoundationRelativePath =
     @"../SharedFrameworks/DVTFoundation.framework";
 NSString* const kDevToolsFoundationRelativePath =
     @"../OtherFrameworks/DevToolsFoundation.framework";
 NSString* const kSimulatorRelativePath =
     @"Platforms/iPhoneSimulator.platform/Developer/Applications/"
     @"iPhone Simulator.app";
 
 // Simulator Error String Key. This can be found by looking in the Simulator's
 // Localizable.strings files.
 NSString* const kSimulatorAppQuitErrorKey = @"The simulated application quit.";
 
 const char* gToolName = "iossim";
 
 // Exit status codes.
 const int kExitSuccess = EXIT_SUCCESS;
 const int kExitFailure = EXIT_FAILURE;
 const int kExitInvalidArguments = 2;
 const int kExitInitializationFailure = 3;
 const int kExitAppFailedToStart = 4;
 const int kExitAppCrashed = 5;
+const int kExitUnsupportedXcodeVersion = 6;
 
 void LogError(NSString* format, ...) {
   va_list list;
   va_start(list, format);
 
   NSString* message =
       [[[NSString alloc] initWithFormat:format arguments:list] autorelease];
 
   fprintf(stderr, "%s: ERROR: %s\n", gToolName, [message UTF8String]);
   fflush(stderr);
@@ skipping 17 matching lines @@
 // Helper to find a class by name and die if it isn't found.
 Class FindClassByName(NSString* nameOfClass) {
   Class theClass = NSClassFromString(nameOfClass);
   if (!theClass) {
     LogError(@"Failed to find class %@ at runtime.", nameOfClass);
     exit(kExitInitializationFailure);
   }
   return theClass;
 }
 
+// Returns the a NSString containing the stdout from running an NSTask that
+// launches |toolPath| with th given command line |args|.
+NSString* GetOutputFromTask(NSString* toolPath, NSArray* args) {
+  NSTask* task = [[[NSTask alloc] init] autorelease];
+  [task setLaunchPath:toolPath];
+  [task setArguments:args];
+  NSPipe* outputPipe = [NSPipe pipe];
+  [task setStandardOutput:outputPipe];
+  NSFileHandle* outputFile = [outputPipe fileHandleForReading];
+
+  [task launch];
+  NSData* outputData = [outputFile readDataToEndOfFile];
+  [task waitUntilExit];
+  if ([task isRunning]) {
+    LogError(@"Task '%@ %@' is still running.",
+        toolPath,
+        [args componentsJoinedByString:@" "]);
+    return nil;
+  } else if ([task terminationStatus]) {
+    LogError(@"Task '%@ %@' exited with return code %@.",

[TVL, 2014/08/25 13:19:03]

isn't terminationStatus an int?  (you are using %@)

[lliabraa, 2014/08/25 13:28:36]

Done. changed to %d

+        toolPath,
+        [args componentsJoinedByString:@" "],
+        [task terminationStatus]);
+    return nil;
+  }
+  return [[[NSString alloc] initWithData:outputData
+                                encoding:NSUTF8StringEncoding] autorelease];
+}
+
+// Finds the Xcode version via xcodebuild -version. Output from xcodebuild is
+// expected to look like:
+//   Xcode <version>
+//   Build version 5B130a
+// where <version> is the string returned by this function (e.g. 6.0).
+NSString* FindXcodeVersion() {
+  NSString* output = GetOutputFromTask(@"/usr/bin/xcodebuild",
+                                       @[ @"-version" ]);
+  // Scan past the "Xcode ", then scan the rest of the line into |version|.
+  NSScanner* scanner = [NSScanner scannerWithString:output];
+  BOOL valid = [scanner scanString:@"Xcode " intoString:NULL];
+  NSString* version;
+  valid =
+      [scanner scanUpToCharactersFromSet:[NSCharacterSet newlineCharacterSet]
+                              intoString:&version];
+  if (!valid) {
+    LogError(@"Unable to find Xcode version. 'xcodebuild -version' "
+             @"returned \n%@", output);
+    return nil;
+  }
+  return version;
+}
+
+// Returns true if iossim is running with Xcode 6 or later installed on the
+// host.
+BOOL IsRunningWithXcode6OrLater() {
+  static NSString* xcodeVersion = FindXcodeVersion();
+  if (!xcodeVersion) {
+    return false;
+  }
+  NSArray* components = [xcodeVersion componentsSeparatedByString:@"."];
+  if ([components count] < 1) {
+    return false;
+  }
+  NSInteger majorVersion = [components[0] integerValue];
+  return majorVersion >= 6;
+}
+
 // Prints supported devices and SDKs.
 void PrintSupportedDevices() {
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
+  if (IsRunningWithXcode6OrLater()) {
 #if defined(IOSSIM_USE_XCODE_6)
-  printf("Supported device/SDK combinations:\n");
-  Class simDeviceSetClass = FindClassByName(@"SimDeviceSet");
-  id deviceSet =
-      [simDeviceSetClass setForSetPath:[simDeviceSetClass defaultSetPath]];
-  for (id simDevice in [deviceSet availableDevices]) {
-    NSString* deviceInfo =
-        [NSString stringWithFormat:@"  -d '%@' -s '%@'\n",
-            [simDevice name], [[simDevice runtime] versionString]];
-    printf("%s", [deviceInfo UTF8String]);
+    printf("Supported device/SDK combinations:\n");
+    Class simDeviceSetClass = FindClassByName(@"SimDeviceSet");
+    id deviceSet =
+        [simDeviceSetClass setForSetPath:[simDeviceSetClass defaultSetPath]];
+    for (id simDevice in [deviceSet availableDevices]) {
+      NSString* deviceInfo =
+          [NSString stringWithFormat:@"  -d '%@' -s '%@'\n",
+              [simDevice name], [[simDevice runtime] versionString]];
+      printf("%s", [deviceInfo UTF8String]);
+    }
+#endif  // IOSSIM_USE_XCODE_6
+  } else {
+    printf("Supported SDK versions:\n");
+    Class rootClass = FindClassByName(@"DTiPhoneSimulatorSystemRoot");
+    for (id root in [rootClass knownRoots]) {
+      printf("  '%s'\n", [[root sdkVersion] UTF8String]);
+    }
+    // This is the list of devices supported on Xcode 5.1.x.
+    printf("Supported devices:\n");
+    printf("  'iPhone'\n");
+    printf("  'iPhone Retina (3.5-inch)'\n");
+    printf("  'iPhone Retina (4-inch)'\n");
+    printf("  'iPhone Retina (4-inch 64-bit)'\n");
+    printf("  'iPad'\n");
+    printf("  'iPad Retina'\n");
+    printf("  'iPad Retina (64-bit)'\n");
   }
-#else
-  printf("Supported SDK versions:\n");
-  Class rootClass = FindClassByName(@"DTiPhoneSimulatorSystemRoot");
-  for (id root in [rootClass knownRoots]) {
-    printf("  '%s'\n", [[root sdkVersion] UTF8String]);
-  }
-  printf("Supported devices:\n");
-  printf("  'iPhone'\n");
-  printf("  'iPhone Retina (3.5-inch)'\n");
-  printf("  'iPhone Retina (4-inch)'\n");
-  printf("  'iPhone Retina (4-inch 64-bit)'\n");
-  printf("  'iPad'\n");
-  printf("  'iPad Retina'\n");
-  printf("  'iPad Retina (64-bit)'\n");
-#endif  // defined(IOSSIM_USE_XCODE_6)
 }
 }  // namespace
 
 // A delegate that is called when the simulated app is started or ended in the
 // simulator.
 @interface SimulatorDelegate : NSObject <DTiPhoneSimulatorSessionDelegate> {
  @private
   NSString* stdioPath_;
   NSString* developerDir_;
   NSString* simulatorHome_;
@@ skipping 38 matching lines @@
 // Reads data from the simulated app's output and writes it to stdout. This
 // method blocks, so it should be called in a separate thread. The iOS
 // Simulator takes a file path for the simulated app's stdout and stderr, but
 // this path isn't always available (e.g. when the stdout is Xcode's build
 // window). As a workaround, iossim creates a temp file to hold output, which
 // this method reads and copies to stdout.
 - (void)tailOutputForSession:(DTiPhoneSimulatorSession*)session {
   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
 
   NSFileHandle* simio = [NSFileHandle fileHandleForReadingAtPath:stdioPath_];
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
+  if (IsRunningWithXcode6OrLater()) {
 #if defined(IOSSIM_USE_XCODE_6)
-  // With iOS 8 simulators on Xcode 6, the app output is relative to the
-  // simulator's data directory.
-  if ([session.sessionConfig.simulatedSystemRoot.sdkVersion isEqual:@"8.0"]) {
-    NSString* dataPath = session.sessionConfig.device.dataPath;
-    NSString* appOutput = [dataPath stringByAppendingPathComponent:stdioPath_];
-    simio = [NSFileHandle fileHandleForReadingAtPath:appOutput];
+    // With iOS 8 simulators on Xcode 6, the app output is relative to the
+    // simulator's data directory.
+    if ([session.sessionConfig.simulatedSystemRoot.sdkVersion isEqual:@"8.0"]) {
+      NSString* dataPath = session.sessionConfig.device.dataPath;
+      NSString* appOutput =
+          [dataPath stringByAppendingPathComponent:stdioPath_];
+      simio = [NSFileHandle fileHandleForReadingAtPath:appOutput];
+    }
+#endif  // IOSSIM_USE_XCODE_6
   }
-#endif
   NSFileHandle* standardOutput = [NSFileHandle fileHandleWithStandardOutput];
   // Copy data to stdout/stderr while the app is running.
   while (appRunning_) {
     NSAutoreleasePool* innerPool = [[NSAutoreleasePool alloc] init];
     [standardOutput writeData:[simio readDataToEndOfFile]];
     [NSThread sleepForTimeInterval:kOutputPollIntervalSeconds];
     [innerPool drain];
   }
 
   // Once the app is no longer running, copy any data that was written during
@@ skipping 128 matching lines @@
       const char* message = asl_get(entry, ASL_KEY_MSG);
       LogWarning(@"Console message: %s", message);
       // Some messages are harmless, so don't trigger a failure for them.
       if (strstr(message, "The following job tried to hijack the service"))
         continue;
       badEntryFound = YES;
     }
   } else {
     // Otherwise, the iOS Simulator's system logging is sandboxed, so parse the
     // sandboxed system.log file for known errors.
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
+    NSString* path;
+    if (IsRunningWithXcode6OrLater()) {
 #if defined(IOSSIM_USE_XCODE_6)
-  NSString* dataPath = session.sessionConfig.device.dataPath;
-  NSString* path =
-      [dataPath stringByAppendingPathComponent:@"Library/Logs/system.log"];
-#else
-    NSString* relativePathToSystemLog =
-        [NSString stringWithFormat:
-            @"Library/Logs/iOS Simulator/%@/system.log", versionString];
-    NSString* path =
-        [simulatorHome_ stringByAppendingPathComponent:relativePathToSystemLog];
-#endif  // defined(IOSSIM_USE_XCODE_6)
+      NSString* dataPath = session.sessionConfig.device.dataPath;
+      path =
+          [dataPath stringByAppendingPathComponent:@"Library/Logs/system.log"];
+#endif  // IOSSIM_USE_XCODE_6
+    } else {
+      NSString* relativePathToSystemLog =
+          [NSString stringWithFormat:
+              @"Library/Logs/iOS Simulator/%@/system.log", versionString];
+      path = [simulatorHome_
+          stringByAppendingPathComponent:relativePathToSystemLog];
+    }
     NSFileManager* fileManager = [NSFileManager defaultManager];
     if ([fileManager fileExistsAtPath:path]) {
       NSString* content =
           [NSString stringWithContentsOfFile:path
                                     encoding:NSUTF8StringEncoding
                                        error:NULL];
       NSArray* lines = [content componentsSeparatedByCharactersInSet:
           [NSCharacterSet newlineCharacterSet]];
       NSString* simulatedAppPID =
           [NSString stringWithFormat:@"%d", session.simulatedApplicationPID];
@@ skipping 29 matching lines @@
 // Finds the developer dir via xcode-select or the DEVELOPER_DIR environment
 // variable.
 NSString* FindDeveloperDir() {
   // Check the env first.
   NSDictionary* env = [[NSProcessInfo processInfo] environment];
   NSString* developerDir = [env objectForKey:@"DEVELOPER_DIR"];
   if ([developerDir length] > 0)
     return developerDir;
 
   // Go look for it via xcode-select.
-  NSTask* xcodeSelectTask = [[[NSTask alloc] init] autorelease];
-  [xcodeSelectTask setLaunchPath:@"/usr/bin/xcode-select"];
-  [xcodeSelectTask setArguments:[NSArray arrayWithObject:@"-print-path"]];
-
-  NSPipe* outputPipe = [NSPipe pipe];
-  [xcodeSelectTask setStandardOutput:outputPipe];
-  NSFileHandle* outputFile = [outputPipe fileHandleForReading];
-
-  [xcodeSelectTask launch];
-  NSData* outputData = [outputFile readDataToEndOfFile];
-  [xcodeSelectTask terminate];
-
-  NSString* output =
-      [[[NSString alloc] initWithData:outputData
-                             encoding:NSUTF8StringEncoding] autorelease];
+  NSString* output = GetOutputFromTask(@"/usr/bin/xcode-select",
+                                       @[ @"-print-path" ]);
   output = [output stringByTrimmingCharactersInSet:
       [NSCharacterSet whitespaceAndNewlineCharacterSet]];
   if ([output length] == 0)
     output = nil;
   return output;
 }
 
 // Loads the Simulator framework from the given developer dir.
 NSBundle* LoadSimulatorFramework(NSString* developerDir) {
   // The Simulator framework depends on some of the other Xcode private
@@ skipping 14 matching lines @@
 
   // Prime DVTPlatform.
   NSError* error;
   Class DVTPlatformClass = FindClassByName(@"DVTPlatform");
   if (![DVTPlatformClass loadAllPlatformsReturningError:&error]) {
     LogError(@"Unable to loadAllPlatformsReturningError. Error: %@",
          [error localizedDescription]);
     return nil;
   }
 
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
-#if defined(IOSSIM_USE_XCODE_6)
-  NSString* coreSimulatorPath = [developerDir
-      stringByAppendingPathComponent:kCoreSimulatorRelativePath];
-  NSBundle* coreSimulatorBundle =
-      [NSBundle bundleWithPath:coreSimulatorPath];
-  if (![coreSimulatorBundle load])
-    return nil;
-#endif  // defined(IOSSIM_USE_XCODE_6)
-
+  // The path within the developer dir of the private Simulator frameworks.
+  NSString* simulatorFrameworkRelativePath;
+  if (IsRunningWithXcode6OrLater()) {
+    simulatorFrameworkRelativePath =
+        @"../SharedFrameworks/DVTiPhoneSimulatorRemoteClient.framework";
+    NSString* const kCoreSimulatorRelativePath =
+       @"Library/PrivateFrameworks/CoreSimulator.framework";
+    NSString* coreSimulatorPath = [developerDir
+        stringByAppendingPathComponent:kCoreSimulatorRelativePath];
+    NSBundle* coreSimulatorBundle =
+        [NSBundle bundleWithPath:coreSimulatorPath];
+    if (![coreSimulatorBundle load])
+      return nil;
+  } else {
+    simulatorFrameworkRelativePath =
+      @"Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/"
+      @"DVTiPhoneSimulatorRemoteClient.framework";
+  }
   NSString* simBundlePath = [developerDir
-      stringByAppendingPathComponent:kSimulatorFrameworkRelativePath];
+      stringByAppendingPathComponent:simulatorFrameworkRelativePath];
   NSBundle* simBundle = [NSBundle bundleWithPath:simBundlePath];
   if (![simBundle load])
     return nil;
   return simBundle;
 }
 
 // Converts the given app path to an application spec, which requires an
 // absolute path.
 DTiPhoneSimulatorApplicationSpecifier* BuildAppSpec(NSString* appPath) {
   Class applicationSpecifierClass =
@@ skipping 39 matching lines @@
   sessionConfig.applicationToSimulateOnStart = appSpec;
   sessionConfig.simulatedSystemRoot = systemRoot;
   sessionConfig.localizedClientName = @"chromium";
   sessionConfig.simulatedApplicationStdErrPath = stderrPath;
   sessionConfig.simulatedApplicationStdOutPath = stdoutPath;
   sessionConfig.simulatedApplicationLaunchArgs = appArgs;
   sessionConfig.simulatedApplicationLaunchEnvironment = appEnv;
   sessionConfig.simulatedDeviceInfoName = deviceName;
   sessionConfig.simulatedDeviceFamily = deviceFamily;
 
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
+  if (IsRunningWithXcode6OrLater()) {
 #if defined(IOSSIM_USE_XCODE_6)
-  Class simDeviceTypeClass = FindClassByName(@"SimDeviceType");
-  id simDeviceType =
-      [simDeviceTypeClass supportedDeviceTypesByName][deviceName];
-  Class simRuntimeClass = FindClassByName(@"SimRuntime");
-  NSString* identifier = systemRoot.runtime.identifier;
-  id simRuntime = [simRuntimeClass supportedRuntimesByIdentifier][identifier];
+    Class simDeviceTypeClass = FindClassByName(@"SimDeviceType");
+    id simDeviceType =
+        [simDeviceTypeClass supportedDeviceTypesByName][deviceName];
+    Class simRuntimeClass = FindClassByName(@"SimRuntime");
+    NSString* identifier = systemRoot.runtime.identifier;
+    id simRuntime = [simRuntimeClass supportedRuntimesByIdentifier][identifier];
 
-  // Attempt to use an existing device, but create one if a suitable match can't
-  // be found. For example, if the simulator is running with a non-default home
-  // directory (e.g. via iossim's -u command line arg) then there won't be any
-  // devices so one will have to be created.
-  Class simDeviceSetClass = FindClassByName(@"SimDeviceSet");
-  id deviceSet =
-      [simDeviceSetClass setForSetPath:[simDeviceSetClass defaultSetPath]];
-  id simDevice = nil;
-  for (id device in [deviceSet availableDevices]) {
-    if ([device runtime] == simRuntime &&
-        [device deviceType] == simDeviceType) {
-      simDevice = device;
-      break;
+    // Attempt to use an existing device, but create one if a suitable match
+    // can't be found. For example, if the simulator is running with a
+    // non-default home directory (e.g. via iossim's -u command line arg) then
+    // there won't be any devices so one will have to be created.
+    Class simDeviceSetClass = FindClassByName(@"SimDeviceSet");
+    id deviceSet =
+        [simDeviceSetClass setForSetPath:[simDeviceSetClass defaultSetPath]];
+    id simDevice = nil;
+    for (id device in [deviceSet availableDevices]) {
+      if ([device runtime] == simRuntime &&
+          [device deviceType] == simDeviceType) {
+        simDevice = device;
+        break;
+      }
     }
+    if (!simDevice) {
+      NSError* error = nil;
+      // n.b. only the device name is necessary because the iOS Simulator menu
+      // already splits devices by runtime version.
+      NSString* name = [NSString stringWithFormat:@"iossim - %@ ", deviceName];
+      simDevice = [deviceSet createDeviceWithType:simDeviceType
+                                          runtime:simRuntime
+                                             name:name
+                                            error:&error];
+      if (error) {
+        LogError(@"Failed to create device: %@", error);
+        exit(kExitInitializationFailure);
+      }
+    }
+    sessionConfig.device = simDevice;
+#endif  // IOSSIM_USE_XCODE_6
   }
-  if (!simDevice) {
-    NSError* error = nil;
-    // n.b. only the device name is necessary because the iOS Simulator menu
-    // already splits devices by runtime version.
-    NSString* name = [NSString stringWithFormat:@"iossim - %@ ", deviceName];
-    simDevice = [deviceSet createDeviceWithType:simDeviceType
-                                        runtime:simRuntime
-                                           name:name
-                                          error:&error];
-    if (error) {
-      LogError(@"Failed to create device: %@", error);
-      exit(kExitInitializationFailure);
-    }
-  }
-  sessionConfig.device = simDevice;
-#endif
   return sessionConfig;
 }
 
 // Builds a simulator session that will use the given delegate.
 DTiPhoneSimulatorSession* BuildSession(SimulatorDelegate* delegate) {
   Class sessionClass = FindClassByName(@"DTiPhoneSimulatorSession");
   DTiPhoneSimulatorSession* session =
       [[[sessionClass alloc] init] autorelease];
   session.delegate = delegate;
   return session;
@@ skipping 93 matching lines @@
       " Will create a new directory if not specified.\n"
       "  -e  Specifies an environment key=value pair that will be"
       " set in the simulated application's environment.\n"
       "  -t  Specifies the session startup timeout (in seconds)."
       " Defaults to %d.\n"
       "  -l  List supported devices and iOS versions.\n",
       static_cast<int>(kDefaultSessionStartTimeoutSeconds));
 }
 }  // namespace
 
+void EnsureSupportForCurrentXcodeVersion() {
+  if (IsRunningWithXcode6OrLater()) {
+#if !defined(IOSSIM_USE_XCODE_6)

[TVL, 2014/08/25 13:19:03]

will this ever get defined to zero?  i.e. do you just want !IOSSIM_USE_XCODE_6?

[lliabraa, 2014/08/25 13:28:36]

Done.

+    LogError(@"Running on Xcode 6, but Xcode 6 support was not compiled in.");
+    exit(kExitUnsupportedXcodeVersion);
+#endif  // IOSSIM_USE_XCODE_6
+  }
+}
+
 int main(int argc, char* const argv[]) {
+  EnsureSupportForCurrentXcodeVersion();
   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];

[TVL, 2014/08/25 13:19:03]

create the pool first, the do the check.

[lliabraa, 2014/08/25 13:28:36]

Done.

 
   // basename() may modify the passed in string and it returns a pointer to an
   // internal buffer. Give it a copy to modify, and copy what it returns.
   char* worker = strdup(argv[0]);
   char* toolName = basename(worker);
   if (toolName != NULL) {
     toolName = strdup(toolName);
     if (toolName != NULL)
       gToolName = toolName;
   }
   if (worker != NULL)
     free(worker);
 
   NSString* appPath = nil;
   NSString* appName = nil;
   NSString* sdkVersion = nil;
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
-#if defined(IOSSIM_USE_XCODE_6)
-  NSString* deviceName = @"iPhone 5";
-#else
-  NSString* deviceName = @"iPhone";
-#endif
+  NSString* deviceName = IsRunningWithXcode6OrLater() ? @"iPhone 5" : @"iPhone";
   NSString* simHomePath = nil;
   NSMutableArray* appArgs = [NSMutableArray array];
   NSMutableDictionary* appEnv = [NSMutableDictionary dictionary];
   NSTimeInterval sessionStartTimeout = kDefaultSessionStartTimeoutSeconds;
 
   NSString* developerDir = FindDeveloperDir();
   if (!developerDir) {
     LogError(@"Unable to find developer directory.");
     exit(kExitInitializationFailure);
   }
@@ skipping 86 matching lines @@
     exit(kExitInitializationFailure);
   }
 
   // Get the paths for stdout and stderr so the simulated app's output will show
   // up in the caller's stdout/stderr.
   NSString* outputDir = CreateTempDirectory(@"iossim-XXXXXX");
   NSString* stdioPath = [outputDir stringByAppendingPathComponent:@"stdio.txt"];
 
   // Determine the deviceFamily based on the deviceName
   NSNumber* deviceFamily = nil;
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
+  if (IsRunningWithXcode6OrLater()) {
 #if defined(IOSSIM_USE_XCODE_6)
-  Class simDeviceTypeClass = FindClassByName(@"SimDeviceType");
-  if ([simDeviceTypeClass supportedDeviceTypesByName][deviceName] == nil) {
-    LogError(@"Invalid device name: %@.", deviceName);
-    PrintSupportedDevices();
-    exit(kExitInvalidArguments);
+    Class simDeviceTypeClass = FindClassByName(@"SimDeviceType");
+    if ([simDeviceTypeClass supportedDeviceTypesByName][deviceName] == nil) {
+      LogError(@"Invalid device name: %@.", deviceName);
+      PrintSupportedDevices();
+      exit(kExitInvalidArguments);
+    }
+#endif  // IOSSIM_USE_XCODE_6
+  } else {
+    if (!deviceName || CaseInsensitivePrefixSearch(deviceName, @"iPhone")) {
+      deviceFamily = [NSNumber numberWithInt:kIPhoneFamily];
+    } else if (CaseInsensitivePrefixSearch(deviceName, @"iPad")) {
+      deviceFamily = [NSNumber numberWithInt:kIPadFamily];
+    }
+    else {
+      LogError(@"Invalid device name: %@. Must begin with 'iPhone' or 'iPad'",
+               deviceName);
+      exit(kExitInvalidArguments);
+    }
   }
-#else
-  if (!deviceName || CaseInsensitivePrefixSearch(deviceName, @"iPhone")) {
-    deviceFamily = [NSNumber numberWithInt:kIPhoneFamily];
-  } else if (CaseInsensitivePrefixSearch(deviceName, @"iPad")) {
-    deviceFamily = [NSNumber numberWithInt:kIPadFamily];
-  }
-  else {
-    LogError(@"Invalid device name: %@. Must begin with 'iPhone' or 'iPad'",
-             deviceName);
-    exit(kExitInvalidArguments);
-  }
-#endif  // !defined(IOSSIM_USE_XCODE_6)
 
   // Set up the user home directory for the simulator only if a non-default
   // value was specified.
   if (simHomePath) {
     if (!InitializeSimulatorUserHome(simHomePath)) {
       LogError(@"Unable to initialize home directory for simulator: %@",
                simHomePath);
       exit(kExitInitializationFailure);
     }
   } else {
@@ skipping 30 matching lines @@
              [error localizedDescription],
              [error domain], static_cast<long int>([error code]));
   }
 
   // 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 kExitFailure;
 }