Fix iOS application tests on Xcode 7.

facebookarchive · Apr 8, 2016 · 2cd7a65 · 2cd7a65
1 parent 0927fee
commit 2cd7a65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/xctool/xctool/AnalyzeAction.mm b/xctool/xctool/AnalyzeAction.mm
@@ -177,7 +177,7 @@ + (NSSet *)findAnalyzerPlistPathsForProject:(NSString *)projectName
     }
     return plistPaths;
   }
-  
+
   NSString *dgphPath = [path stringByAppendingPathComponent:@"dgph"];
   if ([[NSFileManager defaultManager] fileExistsAtPath:dgphPath]) {
     DgphFile dgph = DgphFile::loadFromFile(dgphPath.UTF8String);
@@ -193,7 +193,7 @@ + (NSSet *)findAnalyzerPlistPathsForProject:(NSString *)projectName
       NSLog(@"Failed to load dgph file to discover analyzer outputs, analyzer output may be incomplete.");
     }
   }
-  
+
   if (path && projectName && targetName) {
     NSString *analyzerFilesPath = [NSString pathWithComponents:@[
                                                                  path,

diff --git a/xctool/xctool/SimulatorWrapper/SimulatorInfo.m b/xctool/xctool/SimulatorWrapper/SimulatorInfo.m
@@ -333,7 +333,7 @@ - (NSMutableDictionary *)simulatorLaunchEnvironment
   NSString *sdkName = _buildSettings[Xcode_SDK_NAME];
   NSString *ideBundleInjectionLibPath = [_buildSettings[Xcode_PLATFORM_DIR] stringByAppendingPathComponent:@"Developer/Library/PrivateFrameworks/IDEBundleInjection.framework/IDEBundleInjection"];
   NSMutableDictionary *environment = nil;
-  NSMutableArray *librariesToInsert = [NSMutableArray arrayWithObject:ideBundleInjectionLibPath];
+  NSMutableArray *librariesToInsert = [NSMutableArray array];
   if ([sdkName hasPrefix:@"macosx"]) {
     environment = OSXTestEnvironment(_buildSettings);
     [librariesToInsert addObject:[XCToolLibPath() stringByAppendingPathComponent:@"otest-shim-osx.dylib"]];
@@ -346,6 +346,7 @@ - (NSMutableDictionary *)simulatorLaunchEnvironment
   } else {
     NSAssert(false, @"'%@' sdk is not yet supported", sdkName);
   }
+  [librariesToInsert addObject:ideBundleInjectionLibPath];
 
   [environment addEntriesFromDictionary:@{
     @"DYLD_INSERT_LIBRARIES" : [librariesToInsert componentsJoinedByString:@":"],