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 settings;
 }

 - (NSString *)matchingSchemePathForWorkspace
 {
  NSString *matchingSchemePath = nil;

  NSArray *schemePaths = [XcodeSubjectInfo schemePathsInWorkspace:self.subjectWorkspace];
  for (NSString *schemePath in schemePaths) {
    if ([schemePath hasSuffix:[NSString stringWithFormat:@"/%@.xcscheme", self.subjectScheme]]) {
      matchingSchemePath = schemePath;
    }
  }

  return matchingSchemePath;
 }

 - (NSString *)matchingSchemePathForProject
 {
  NSString *matchingSchemePath = nil;

  NSArray *schemePaths = [XcodeSubjectInfo schemePathsInContainer:self.subjectProject];
  for (NSString *schemePath in schemePaths) {
    if ([schemePath hasSuffix:[NSString stringWithFormat:@"/%@.xcscheme", self.subjectScheme]]) {
      matchingSchemePath = schemePath;
    }
  }

  return matchingSchemePath;
 }

 - (void)populate
 {
  if (_didPopulate) {
  NSString *matchingSchemePath = nil;

  if (self.subjectWorkspace) {
    NSArray *schemePaths = [XcodeSubjectInfo schemePathsInWorkspace:self.subjectWorkspace];
    for (NSString *schemePath in schemePaths) {
      if ([schemePath hasSuffix:[NSString stringWithFormat:@"/%@.xcscheme", self.subjectScheme]]) {
        matchingSchemePath = schemePath;
      }
    }
    matchingSchemePath = [self matchingSchemePathForWorkspace];
  } else {
    matchingSchemePath = [self matchingSchemePathForProject];
  }

  if (self.subjectWorkspace) {
    NSArray *testables = [[self class] testablesInSchemePath:matchingSchemePath
                                                    basePath:BasePathFromSchemePath(matchingSchemePath)];
    NSArray *buildables = [[self class] buildablesInSchemePath:matchingSchemePath
                                         [[obj objectForKey:@"forTesting"] boolValue]);
                               }]];
  } else {
    NSArray *schemePaths = [XcodeSubjectInfo schemePathsInContainer:self.subjectProject];
    for (NSString *schemePath in schemePaths) {
      if ([schemePath hasSuffix:[NSString stringWithFormat:@"/%@.xcscheme", self.subjectScheme]]) {
        matchingSchemePath = schemePath;
      }
    }

    self.testables = [[self class] testablesInSchemePath:matchingSchemePath
                                                basePath:BasePathFromSchemePath(matchingSchemePath)];
Original file line number	Diff line number	Diff line change
Expand Up		@@ -771,6 +771,34 @@ - (NSDictionary *)buildSettingsForFirstBuildable
		return settings;
		}

		- (NSString *)matchingSchemePathForWorkspace
		{
		NSString *matchingSchemePath = nil;

		NSArray *schemePaths = [XcodeSubjectInfo schemePathsInWorkspace:self.subjectWorkspace];
		for (NSString *schemePath in schemePaths) {
		if ([schemePath hasSuffix:[NSString stringWithFormat:@"/%@.xcscheme", self.subjectScheme]]) {
		matchingSchemePath = schemePath;
		}
		}

		return matchingSchemePath;
		}

		- (NSString *)matchingSchemePathForProject
		{
		NSString *matchingSchemePath = nil;

		NSArray *schemePaths = [XcodeSubjectInfo schemePathsInContainer:self.subjectProject];
		for (NSString *schemePath in schemePaths) {
		if ([schemePath hasSuffix:[NSString stringWithFormat:@"/%@.xcscheme", self.subjectScheme]]) {
		matchingSchemePath = schemePath;
		}
		}

		return matchingSchemePath;
		}

		- (void)populate
		{
		if (_didPopulate) {
Expand DownExpand Up		@@ -798,13 +826,12 @@ - (void)populate
		NSString *matchingSchemePath = nil;

		if (self.subjectWorkspace) {
		NSArray *schemePaths = [XcodeSubjectInfo schemePathsInWorkspace:self.subjectWorkspace];
		for (NSString *schemePath in schemePaths) {
		if ([schemePath hasSuffix:[NSString stringWithFormat:@"/%@.xcscheme", self.subjectScheme]]) {
		matchingSchemePath = schemePath;
		}
		}
		matchingSchemePath = [self matchingSchemePathForWorkspace];
		} else {
		matchingSchemePath = [self matchingSchemePathForProject];
		}

		if (self.subjectWorkspace) {
		NSArray *testables = [[self class] testablesInSchemePath:matchingSchemePath
		basePath:BasePathFromSchemePath(matchingSchemePath)];
		NSArray *buildables = [[self class] buildablesInSchemePath:matchingSchemePath
Expand DownExpand Up		@@ -837,13 +864,6 @@ - (void)populate
		[[obj objectForKey:@"forTesting"] boolValue]);
		}]];
		} else {
		NSArray *schemePaths = [XcodeSubjectInfo schemePathsInContainer:self.subjectProject];
		for (NSString *schemePath in schemePaths) {
		if ([schemePath hasSuffix:[NSString stringWithFormat:@"/%@.xcscheme", self.subjectScheme]]) {
		matchingSchemePath = schemePath;
		}
		}

		self.testables = [[self class] testablesInSchemePath:matchingSchemePath
		basePath:BasePathFromSchemePath(matchingSchemePath)];

Expand Down