Skip to content

Commit

Permalink
Test integration testing support better
Browse files Browse the repository at this point in the history
1. Ensure correct artifacts are returned by the simulated build dependencies action.
2. Make sure symbols in Kotlin files with unresolved dependencies are not resolved.

PiperOrigin-RevId: 577013400
  • Loading branch information
Googler authored and copybara-github committed Oct 26, 2023
1 parent 3810337 commit f6a9844
Showing 1 changed file with 16 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,25 @@ public Builder add(ProjectViewSet projectViewSet) {
@VisibleForTesting
public Builder add(DirectoryEntry entry) {
if (entry.included) {
rootDirectoriesBuilder.add(entry.directory);
include(entry.directory);
} else {
excludeDirectoriesBuilder.add(entry.directory);
exclude(entry.directory);
}
return this;
}

@CanIgnoreReturnValue
public Builder include(WorkspacePath directory) {
rootDirectoriesBuilder.add(directory);
return this;
}

@CanIgnoreReturnValue
public Builder exclude(WorkspacePath entry) {
excludeDirectoriesBuilder.add(entry);
return this;
}

public ImportRoots build() {
ImmutableCollection<WorkspacePath> rootDirectories = rootDirectoriesBuilder.build();
if (buildSystemName == BuildSystemName.Bazel) {
Expand Down Expand Up @@ -134,12 +146,12 @@ private void excludeBuildSystemArtifacts() {
for (String dir :
BuildSystemProvider.getBuildSystemProvider(buildSystemName)
.buildArtifactDirectories(workspaceRoot)) {
excludeDirectoriesBuilder.add(new WorkspacePath(dir));
exclude(new WorkspacePath(dir));
}
}

private void excludeProjectDataSubDirectory() {
excludeDirectoriesBuilder.add(new WorkspacePath(BlazeDataStorage.PROJECT_DATA_SUBDIRECTORY));
exclude(new WorkspacePath(BlazeDataStorage.PROJECT_DATA_SUBDIRECTORY));
}

private void excludeBazelIgnoredPaths() {
Expand Down

0 comments on commit f6a9844

Please sign in to comment.