Remove support for old version of Xcode from iossim.

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.
 
 #include <asl.h>
 #import <Foundation/Foundation.h>
 #include <libgen.h>
 #include <stdarg.h>
 #include <stdio.h>
 
 // An executable (iossim) that runs an app in the iOS Simulator.
 // Run 'iossim -h' for usage information.
 //
 // For best results, the iOS Simulator application should not be running when
 // iossim is invoked.
 //
 // Headers for iPhoneSimulatorRemoteClient and other frameworks used in this
 // tool are generated by class-dump, via GYP.
 // (class-dump is available at http://www.codethecode.com/projects/class-dump/)
 //
 // However, there are some forward declarations required to get things to
 // compile.
 
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
-#if defined(IOSSIM_USE_XCODE_6)
 @class DVTStackBacktrace;
 #import "DVTFoundation.h"
-#endif  // IOSSIM_USE_XCODE_6
 
-// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
-// (crbug.com/385030).
-#if defined(IOSSIM_USE_XCODE_6)
 @protocol SimBridge;
 @class DVTSimulatorApplication;
 @class SimDeviceSet;
 @class SimDeviceType;
 @class SimProfilesPathMonitor;
 @class SimRuntime;
 @class SimServiceConnectionManager;
 #import "CoreSimulator.h"
-#endif  // IOSSIM_USE_XCODE_6
 
 @interface DVTPlatform : NSObject
 + (BOOL)loadAllPlatformsReturningError:(id*)arg1;
 @end
 @class DTiPhoneSimulatorApplicationSpecifier;
 @class DTiPhoneSimulatorSession;
 @class DTiPhoneSimulatorSessionConfig;
 @class DTiPhoneSimulatorSystemRoot;
 @class DVTConfinementServiceConnection;
 @class DVTDispatchLock;
@@ skipping 17 matching lines @@
 // is the PID of the process the message is about (as opposed to launchd's PID).
 #define ASL_KEY_REF_PID "RefPID"
 
 namespace {
 
 // Name of environment variables that control the user's home directory in the
 // simulator.
 const char* const kUserHomeEnvVariable = "CFFIXED_USER_HOME";
 const char* const kHomeEnvVariable = "HOME";
 
-// Device family codes for iPhone and iPad.
-const int kIPhoneFamily = 1;
-const int kIPadFamily = 2;
-
 // Max number of seconds to wait for the simulator session to start.
 // This timeout must allow time to start up iOS Simulator, install the app
 // and perform any other black magic that is encoded in the
 // iPhoneSimulatorRemoteClient framework to kick things off. Normal start up
 // time is only a couple seconds but machine load, disk caches, etc., can all
 // affect startup time in the wild so the timeout needs to be fairly generous.
 // 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;
@@ skipping 17 matching lines @@
 
 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 46 matching lines @@
     LogError(@"Task '%@ %@' exited with return code %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 objectAtIndex:0] integerValue];
-  return majorVersion >= 6;
-}
-
 // Prints supported devices and SDKs.
 void PrintSupportedDevices() {
-  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]);
-    }
-#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");
+  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]);
   }
 }
 }  // 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_;
@@ skipping 39 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_];
-  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.
-    NSString* versionString =
-        [[[session sessionConfig] simulatedSystemRoot] sdkVersion];
-    NSInteger majorVersion = [[[versionString componentsSeparatedByString:@"."]
-        objectAtIndex:0] intValue];
-    if (majorVersion >= 8) {
-      NSString* dataPath = session.sessionConfig.device.dataPath;
-      NSString* appOutput =
-          [dataPath stringByAppendingPathComponent:stdioPath_];
-      simio = [NSFileHandle fileHandleForReadingAtPath:appOutput];
-    }
-#endif  // IOSSIM_USE_XCODE_6
+  NSString* versionString =
+      [[[session sessionConfig] simulatedSystemRoot] sdkVersion];
+  NSInteger majorVersion = [[[versionString componentsSeparatedByString:@"."]
+      objectAtIndex:0] intValue];
+  if (majorVersion >= 8) {
+    NSString* dataPath = session.sessionConfig.device.dataPath;
+    NSString* appOutput =
+        [dataPath stringByAppendingPathComponent:stdioPath_];
+    simio = [NSFileHandle fileHandleForReadingAtPath:appOutput];
   }
   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];
   }
 
@@ skipping 130 matching lines @@
       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.
     NSString* path;
-    if (IsRunningWithXcode6OrLater()) {
-#if 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];
-    }
+    NSString* dataPath = session.sessionConfig.device.dataPath;
+    path =
+        [dataPath stringByAppendingPathComponent:@"Library/Logs/system.log"];
     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 76 matching lines @@
   NSError* error;
   Class DVTPlatformClass = FindClassByName(@"DVTPlatform");
   if (![DVTPlatformClass loadAllPlatformsReturningError:&error]) {
     LogError(@"Unable to loadAllPlatformsReturningError. Error: %@",
          [error localizedDescription]);
     return nil;
   }
 
   // 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";
-  }
+  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;
   NSString* simBundlePath = [developerDir
       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.
@@ skipping 11 matching lines @@
     exit(kExitInvalidArguments);
   }
   return [applicationSpecifierClass specifierWithApplicationPath:appPath];
 }
 
 // Returns the system root for the given SDK version. If sdkVersion is nil, the
 // default system root is returned.  Will return nil if the sdkVersion is not
 // valid.
 DTiPhoneSimulatorSystemRoot* BuildSystemRoot(NSString* sdkVersion) {
   Class systemRootClass = FindClassByName(@"DTiPhoneSimulatorSystemRoot");
-#if defined(IOSSIM_USE_XCODE_6)
   Class simRuntimeClass = FindClassByName(@"SimRuntime");
   NSArray* sorted =
       [[simRuntimeClass supportedRuntimes] sortedArrayUsingDescriptors:@[
         [NSSortDescriptor sortDescriptorWithKey:@"version" ascending:YES]
       ]];
   NSString* versionString = [[sorted lastObject] versionString];
   DTiPhoneSimulatorSystemRoot* systemRoot =
       [systemRootClass rootWithSDKVersion:versionString];
-#else
-  DTiPhoneSimulatorSystemRoot* systemRoot = [systemRootClass defaultRoot];
-#endif
   if (sdkVersion)
     systemRoot = [systemRootClass rootWithSDKVersion:sdkVersion];
 
   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,
     NSString* deviceName) {
   Class sessionConfigClass = FindClassByName(@"DTiPhoneSimulatorSessionConfig");
   DTiPhoneSimulatorSessionConfig* sessionConfig =
       [[[sessionConfigClass alloc] init] autorelease];
   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;
 
-  if (IsRunningWithXcode6OrLater()) {
-#if defined(IOSSIM_USE_XCODE_6)
-    Class simDeviceTypeClass = FindClassByName(@"SimDeviceType");
-    id simDeviceType =
-        [simDeviceTypeClass supportedDeviceTypesByAlias][deviceName];
-    Class simRuntimeClass = FindClassByName(@"SimRuntime");
-    NSString* identifier = systemRoot.runtime.identifier;
-    id simRuntime = [simRuntimeClass supportedRuntimesByIdentifier][identifier];
+  Class simDeviceTypeClass = FindClassByName(@"SimDeviceType");
+  id simDeviceType =
+      [simDeviceTypeClass supportedDeviceTypesByAlias][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);
-      }
+  }
+  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
   }
+  sessionConfig.device = simDevice;
   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 60 matching lines @@
   // variable's value if it has already been set.
   if ((setenv(kUserHomeEnvVariable, [userHomePath UTF8String], YES) == -1) ||
       (setenv(kHomeEnvVariable, [userHomePath UTF8String], YES) == -1)) {
     LogError(@"Unable to set environment variables for home directory.");
     return NO;
   }
 
   return YES;
 }
 
-// Performs a case-insensitive search to see if |stringToSearch| begins with
-// |prefixToFind|. Returns true if a match is found.
-BOOL CaseInsensitivePrefixSearch(NSString* stringToSearch,
-                                 NSString* prefixToFind) {
-  NSStringCompareOptions options = (NSAnchoredSearch | NSCaseInsensitiveSearch);
-  NSRange range = [stringToSearch rangeOfString:prefixToFind
-                                        options:options];
-  return range.location != NSNotFound;
-}
-
 // Prints the usage information to stderr.
 void PrintUsage() {
   fprintf(stderr, "Usage: iossim [-d device] [-s sdkVersion] [-u homeDir] "
       "[-e envKey=value]* [-t startupTimeout] <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 (must be one of the values from the iOS"
       " Simulator's Hardware -> Device menu. 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"
       "  -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 !IOSSIM_USE_XCODE_6
-    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[]) {
   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
 
-  EnsureSupportForCurrentXcodeVersion();
-
   // 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;
-  NSString* deviceName =
-      IsRunningWithXcode6OrLater() ? @"iPhone 5s" : @"iPhone";
+  NSString* deviceName = @"iPhone 5s";
   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;
-  if (IsRunningWithXcode6OrLater()) {
-#if defined(IOSSIM_USE_XCODE_6)
-    Class simDeviceTypeClass = FindClassByName(@"SimDeviceType");
-    if ([simDeviceTypeClass supportedDeviceTypesByAlias][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);
-    }
+  Class simDeviceTypeClass = FindClassByName(@"SimDeviceType");
+  if ([simDeviceTypeClass supportedDeviceTypesByAlias][deviceName] == nil) {
+    LogError(@"Invalid device name: %@.", deviceName);
+    PrintSupportedDevices();
+    exit(kExitInvalidArguments);
   }
 
   // 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);
     }
@@ skipping 31 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;
 }