diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util')
4 files changed, 21 insertions, 14 deletions
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 ba14b25232..c5d64aad4e 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 @@ -15,6 +15,7 @@ package com.google.devtools.build.lib.analysis.util; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryFunction; @@ -24,6 +25,8 @@ import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRul import com.google.devtools.build.lib.packages.util.LoadingMock; import com.google.devtools.build.lib.packages.util.MockCcSupport; import com.google.devtools.build.lib.packages.util.MockToolsConfig; +import com.google.devtools.build.lib.rules.cpp.FdoSupportFunction; +import com.google.devtools.build.lib.rules.cpp.FdoSupportValue; 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; @@ -65,8 +68,10 @@ public abstract class AnalysisMock extends LoadingMock { } @Override - public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting() { - return super.getPackageFactoryBuilderForTesting().setExtraSkyFunctions(getSkyFunctions()); + public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting( + BlazeDirectories directories) { + return super.getPackageFactoryBuilderForTesting(directories) + .setExtraSkyFunctions(getSkyFunctions(directories)); } @Override @@ -113,7 +118,7 @@ public abstract class AnalysisMock extends LoadingMock { get().ccSupport().setup(config); } - public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions() { + public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions(BlazeDirectories directories) { // Some tests require the local_repository rule so we need the appropriate SkyFunctions. RepositoryFunction localRepositoryFunction = new LocalRepositoryFunction(); ImmutableMap<String, RepositoryFunction> repositoryHandlers = ImmutableMap.of( @@ -123,10 +128,11 @@ public abstract class AnalysisMock extends LoadingMock { return ImmutableMap.of( SkyFunctions.REPOSITORY_DIRECTORY, - new RepositoryDelegatorFunction( - repositoryHandlers, null, new AtomicBoolean(true)), + new RepositoryDelegatorFunction(repositoryHandlers, null, new AtomicBoolean(true)), SkyFunctions.REPOSITORY, - new RepositoryLoaderFunction()); + new RepositoryLoaderFunction(), + FdoSupportValue.SKYFUNCTION, + new FdoSupportFunction(directories)); } public static class Delegate extends AnalysisMock { @@ -182,8 +188,9 @@ public abstract class AnalysisMock extends LoadingMock { } @Override - public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions() { - return delegate.getSkyFunctions(); + public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions( + BlazeDirectories directories) { + return delegate.getSkyFunctions(directories); } } } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index e49dbd19e3..44e39288b5 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java @@ -167,7 +167,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { this.ruleClassProvider = ruleClassProvider; PackageFactory pkgFactory = analysisMock - .getPackageFactoryBuilderForTesting() + .getPackageFactoryBuilderForTesting(directories) .build(ruleClassProvider, scratch.getFileSystem()); BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); skyframeExecutor = @@ -179,7 +179,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { ruleClassProvider.getBuildInfoFactories(), ImmutableList.<DiffAwareness.Factory>of(), Predicates.<PathFragment>alwaysFalse(), - analysisMock.getSkyFunctions(), + analysisMock.getSkyFunctions(directories), ImmutableList.of(), ImmutableList.<SkyValueDirtinessChecker>of(), PathFragment.EMPTY_FRAGMENT, diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index e6db01bda0..66a790df25 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -222,7 +222,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { ImmutableMap.<RepositoryName, PathFragment>of())); pkgFactory = analysisMock - .getPackageFactoryBuilderForTesting() + .getPackageFactoryBuilderForTesting(directories) .setExtraPrecomputeValues(extraPrecomputedValues) .setEnvironmentExtensions(getEnvironmentExtensions()) .setPlatformSetRegexps(getPlatformSetRegexps()) @@ -237,7 +237,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { ruleClassProvider.getBuildInfoFactories(), ImmutableList.<DiffAwareness.Factory>of(), Predicates.<PathFragment>alwaysFalse(), - analysisMock.getSkyFunctions(), + analysisMock.getSkyFunctions(directories), ImmutableList.of(), ImmutableList.<SkyValueDirtinessChecker>of(), PathFragment.EMPTY_FRAGMENT, diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index ba5c5ae6a1..09bef53a17 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java @@ -107,7 +107,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { analysisMock.getProductName()); pkgFactory = analysisMock - .getPackageFactoryBuilderForTesting() + .getPackageFactoryBuilderForTesting(directories) .build(ruleClassProvider, scratch.getFileSystem()); AnalysisTestUtil.DummyWorkspaceStatusActionFactory workspaceStatusActionFactory = new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories); @@ -121,7 +121,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { ruleClassProvider.getBuildInfoFactories(), ImmutableList.<DiffAwareness.Factory>of(), Predicates.<PathFragment>alwaysFalse(), - analysisMock.getSkyFunctions(), + analysisMock.getSkyFunctions(directories), ImmutableList.<PrecomputedValue.Injected>of(), ImmutableList.<SkyValueDirtinessChecker>of(), PathFragment.EMPTY_FRAGMENT, |