Jul 12, 2013 · Jul 10, 2013 · Jul 10, 2013 · Jul 10, 2013 · Jul 10, 2013 · Jul 10, 2013
diff --git a/xctool/xctool/XcodeSubjectInfo.m b/xctool/xctool/XcodeSubjectInfo.m
  return matchingSchemePath;
 }

 - (void)populateBuildablesAndTestablesForWorkspaceWithSchemePath:(NSString *)schemePath
 {
  NSArray *testables = [[self class] testablesInSchemePath:schemePath
                                                  basePath:BasePathFromSchemePath(schemePath)];
  NSArray *buildables = [[self class] buildablesInSchemePath:schemePath
                                                    basePath:BasePathFromSchemePath(schemePath)];


  // It's possible that the scheme references projects that aren't part of the workspace.  When
  // Xcode encounters these, it just skips them so we'll do the same.
  NSSet *projectPathsInWorkspace = [NSSet setWithArray:[XcodeSubjectInfo projectPathsInWorkspace:self.subjectWorkspace]];
  BOOL (^workspaceContainsProject)(id) = ^(id item) {
    return [projectPathsInWorkspace containsObject:[item objectForKey:@"projectPath"]];
  };

  self.testables = [testables objectsAtIndexes:
                    [testables indexesOfObjectsPassingTest:
                     ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
                       return workspaceContainsProject(obj);
                     }]];

  self.buildables = [buildables objectsAtIndexes:
                     [buildables indexesOfObjectsPassingTest:
                      ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
                        return workspaceContainsProject(obj);
                      }]];

  self.buildablesForTest = [buildables objectsAtIndexes:
                            [buildables indexesOfObjectsPassingTest:
                             ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
                               return (workspaceContainsProject(obj) &&
                                       [[obj objectForKey:@"forTesting"] boolValue]);
                             }]];
 }

 - (void)populateBuildablesAndTestablesForProjectWithSchemePath:(NSString *)schemePath
 {
  self.testables = [[self class] testablesInSchemePath:schemePath
                                              basePath:BasePathFromSchemePath(schemePath)];

  NSArray *buildables = [[self class] buildablesInSchemePath:schemePath
                                                    basePath:BasePathFromSchemePath(schemePath)];
  self.buildablesForTest = [buildables objectsAtIndexes:
                            [buildables indexesOfObjectsPassingTest:
                             ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
                               return [[obj objectForKey:@"forTesting"] boolValue];
                             }]];
 }

 - (void)populate
 {
  if (_didPopulate) {
  }

  if (self.subjectWorkspace) {
    NSArray *testables = [[self class] testablesInSchemePath:matchingSchemePath
                                                    basePath:BasePathFromSchemePath(matchingSchemePath)];
    NSArray *buildables = [[self class] buildablesInSchemePath:matchingSchemePath
                                                      basePath:BasePathFromSchemePath(matchingSchemePath)];


    // It's possible that the scheme references projects that aren't part of the workspace.  When
    // Xcode encounters these, it just skips them so we'll do the same.
    NSSet *projectPathsInWorkspace = [NSSet setWithArray:[XcodeSubjectInfo projectPathsInWorkspace:self.subjectWorkspace]];
    BOOL (^workspaceContainsProject)(id) = ^(id item) {
      return [projectPathsInWorkspace containsObject:[item objectForKey:@"projectPath"]];
    };

    self.testables = [testables objectsAtIndexes:
                      [testables indexesOfObjectsPassingTest:
                       ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
                         return workspaceContainsProject(obj);
                       }]];

    self.buildables = [buildables objectsAtIndexes:
                       [buildables indexesOfObjectsPassingTest:
                        ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
                          return workspaceContainsProject(obj);
                        }]];

    self.buildablesForTest = [buildables objectsAtIndexes:
                              [buildables indexesOfObjectsPassingTest:
                               ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
                                 return (workspaceContainsProject(obj) &&
                                         [[obj objectForKey:@"forTesting"] boolValue]);
                               }]];
    [self populateBuildablesAndTestablesForWorkspaceWithSchemePath:matchingSchemePath];
  } else {
    self.testables = [[self class] testablesInSchemePath:matchingSchemePath
                                                basePath:BasePathFromSchemePath(matchingSchemePath)];

    NSArray *buildables = [[self class] buildablesInSchemePath:matchingSchemePath
                                                         basePath:BasePathFromSchemePath(matchingSchemePath)];
    self.buildablesForTest = [buildables objectsAtIndexes:
                              [buildables indexesOfObjectsPassingTest:
                               ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
                                 return [[obj objectForKey:@"forTesting"] boolValue];
                               }]];
    [self populateBuildablesAndTestablesForProjectWithSchemePath:matchingSchemePath];
  }

  _configurationNameByAction =
Original file line number	Diff line number	Diff line change
Expand Up		@@ -799,6 +799,55 @@ - (NSString *)matchingSchemePathForProject
		return matchingSchemePath;
		}

		- (void)populateBuildablesAndTestablesForWorkspaceWithSchemePath:(NSString *)schemePath
		{
		NSArray *testables = [[self class] testablesInSchemePath:schemePath
		basePath:BasePathFromSchemePath(schemePath)];
		NSArray *buildables = [[self class] buildablesInSchemePath:schemePath
		basePath:BasePathFromSchemePath(schemePath)];


		// It's possible that the scheme references projects that aren't part of the workspace. When
		// Xcode encounters these, it just skips them so we'll do the same.
		NSSet *projectPathsInWorkspace = [NSSet setWithArray:[XcodeSubjectInfo projectPathsInWorkspace:self.subjectWorkspace]];
		BOOL (^workspaceContainsProject)(id) = ^(id item) {
		return [projectPathsInWorkspace containsObject:[item objectForKey:@"projectPath"]];
		};

		self.testables = [testables objectsAtIndexes:
		[testables indexesOfObjectsPassingTest:
		^BOOL(id obj, NSUInteger idx, BOOL *stop) {
		return workspaceContainsProject(obj);
		}]];

		self.buildables = [buildables objectsAtIndexes:
		[buildables indexesOfObjectsPassingTest:
		^BOOL(id obj, NSUInteger idx, BOOL *stop) {
		return workspaceContainsProject(obj);
		}]];

		self.buildablesForTest = [buildables objectsAtIndexes:
		[buildables indexesOfObjectsPassingTest:
		^BOOL(id obj, NSUInteger idx, BOOL *stop) {
		return (workspaceContainsProject(obj) &&
		[[obj objectForKey:@"forTesting"] boolValue]);
		}]];
		}

		- (void)populateBuildablesAndTestablesForProjectWithSchemePath:(NSString *)schemePath
		{
		self.testables = [[self class] testablesInSchemePath:schemePath
		basePath:BasePathFromSchemePath(schemePath)];

		NSArray *buildables = [[self class] buildablesInSchemePath:schemePath
		basePath:BasePathFromSchemePath(schemePath)];
		self.buildablesForTest = [buildables objectsAtIndexes:
		[buildables indexesOfObjectsPassingTest:
		^BOOL(id obj, NSUInteger idx, BOOL *stop) {
		return [[obj objectForKey:@"forTesting"] boolValue];
		}]];
		}

		- (void)populate
		{
		if (_didPopulate) {
Expand DownExpand Up		@@ -832,48 +881,9 @@ - (void)populate
		}

		if (self.subjectWorkspace) {
		NSArray *testables = [[self class] testablesInSchemePath:matchingSchemePath
		basePath:BasePathFromSchemePath(matchingSchemePath)];
		NSArray *buildables = [[self class] buildablesInSchemePath:matchingSchemePath
		basePath:BasePathFromSchemePath(matchingSchemePath)];


		// It's possible that the scheme references projects that aren't part of the workspace. When
		// Xcode encounters these, it just skips them so we'll do the same.
		NSSet *projectPathsInWorkspace = [NSSet setWithArray:[XcodeSubjectInfo projectPathsInWorkspace:self.subjectWorkspace]];
		BOOL (^workspaceContainsProject)(id) = ^(id item) {
		return [projectPathsInWorkspace containsObject:[item objectForKey:@"projectPath"]];
		};

		self.testables = [testables objectsAtIndexes:
		[testables indexesOfObjectsPassingTest:
		^BOOL(id obj, NSUInteger idx, BOOL *stop) {
		return workspaceContainsProject(obj);
		}]];

		self.buildables = [buildables objectsAtIndexes:
		[buildables indexesOfObjectsPassingTest:
		^BOOL(id obj, NSUInteger idx, BOOL *stop) {
		return workspaceContainsProject(obj);
		}]];

		self.buildablesForTest = [buildables objectsAtIndexes:
		[buildables indexesOfObjectsPassingTest:
		^BOOL(id obj, NSUInteger idx, BOOL *stop) {
		return (workspaceContainsProject(obj) &&
		[[obj objectForKey:@"forTesting"] boolValue]);
		}]];
		[self populateBuildablesAndTestablesForWorkspaceWithSchemePath:matchingSchemePath];
		} else {
		self.testables = [[self class] testablesInSchemePath:matchingSchemePath
		basePath:BasePathFromSchemePath(matchingSchemePath)];

		NSArray *buildables = [[self class] buildablesInSchemePath:matchingSchemePath
		basePath:BasePathFromSchemePath(matchingSchemePath)];
		self.buildablesForTest = [buildables objectsAtIndexes:
		[buildables indexesOfObjectsPassingTest:
		^BOOL(id obj, NSUInteger idx, BOOL *stop) {
		return [[obj objectForKey:@"forTesting"] boolValue];
		}]];
		[self populateBuildablesAndTestablesForProjectWithSchemePath:matchingSchemePath];
		}

		_configurationNameByAction =
Expand Down