diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 1 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 2d7a0ad293..c1da7d3361 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -75,6 +75,7 @@ public final class BazelAnalysisMock extends AnalysisMock { "bind(name = 'tools/python', actual='//tools/python')")); config.overwrite("WORKSPACE", workspaceContents.toArray(new String[workspaceContents.size()])); + config.create("/bazel_tools_workspace/WORKSPACE", "workspace(name = 'bazel_tools')"); config.create( "/bazel_tools_workspace/tools/jdk/BUILD", "package(default_visibility=['//visibility:public'])", diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java index b42b4aae23..2d7c39078a 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java @@ -23,6 +23,7 @@ import com.google.devtools.build.lib.rules.repository.LocalRepositoryFunction; import com.google.devtools.build.lib.rules.repository.LocalRepositoryRule; import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction; import com.google.devtools.build.lib.rules.repository.RepositoryFunction; +import com.google.devtools.build.lib.rules.repository.RepositoryLoaderFunction; import com.google.devtools.build.lib.skyframe.SkyFunctions; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.vfs.Path; @@ -80,9 +81,11 @@ public abstract class AnalysisMock { ImmutableMap<String, RepositoryFunction> repositoryHandlers = ImmutableMap.of( LocalRepositoryRule.NAME, localRepositoryFunction); - return ImmutableMap.<SkyFunctionName, SkyFunction>of( + return ImmutableMap.of( + SkyFunctions.REPOSITORY_DIRECTORY, + new RepositoryDelegatorFunction(directories, repositoryHandlers, new AtomicBoolean(true)), SkyFunctions.REPOSITORY, - new RepositoryDelegatorFunction(directories, repositoryHandlers, new AtomicBoolean(true))); + new RepositoryLoaderFunction()); } public static class Delegate extends AnalysisMock { |