diff options
Diffstat (limited to 'src/test/java/com/google')
6 files changed, 34 insertions, 17 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 291ec1f600..8668cfac31 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -99,6 +99,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", "//third_party:guava", "//third_party:guava-testlib", @@ -1054,6 +1055,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader", + "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", "//third_party:guava", "//third_party:guava-testlib", 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 86c2f9727b..670780c611 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 @@ -16,7 +16,9 @@ package com.google.devtools.build.lib.analysis.mock; import com.google.common.base.Functions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; +import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; +import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfigurationCollectionFactory; import com.google.devtools.build.lib.analysis.config.ConfigurationFactory; import com.google.devtools.build.lib.analysis.util.AnalysisMock; @@ -32,6 +34,8 @@ import com.google.devtools.build.lib.packages.util.MockToolsConfig; import com.google.devtools.build.lib.rules.android.AndroidConfiguration; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; import com.google.devtools.build.lib.rules.cpp.CppConfigurationLoader; +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.java.JavaConfigurationLoader; import com.google.devtools.build.lib.rules.java.JvmConfigurationLoader; import com.google.devtools.build.lib.rules.objc.J2ObjcConfiguration; @@ -42,6 +46,8 @@ import com.google.devtools.build.lib.testutil.BuildRuleWithDefaultsBuilder; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; +import com.google.devtools.build.skyframe.SkyFunction; +import com.google.devtools.build.skyframe.SkyFunctionName; import java.io.IOException; import java.io.InputStream; @@ -221,4 +227,12 @@ public final class BazelAnalysisMock extends AnalysisMock { public MockCcSupport ccSupport() { return BazelMockCcSupport.INSTANCE; } + + @Override + public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions(BlazeDirectories directories) { + ImmutableMap.Builder<SkyFunctionName, SkyFunction> skyFunctions = ImmutableMap.builder(); + skyFunctions.putAll(super.getSkyFunctions(directories)); + skyFunctions.put(FdoSupportValue.SKYFUNCTION, new FdoSupportFunction()); + return skyFunctions.build(); + } } 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 ba70915558..e9e9844082 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 @@ -134,5 +134,11 @@ public abstract class AnalysisMock { public Collection<String> getOptionOverrides() { return delegate.getOptionOverrides(); } + + @Override + public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions( + BlazeDirectories directories) { + return delegate.getSkyFunctions(directories); + } } } 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 abb7a79772..a690340f7c 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 @@ -1503,7 +1503,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { @Override public Artifact getEmbeddedToolArtifact(String embeddedPath) { - throw new UnsupportedOperationException(); + return null; } @Override diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java index 5e677f47a6..12683ace4e 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java @@ -29,6 +29,8 @@ import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException; import com.google.devtools.build.lib.packages.NoSuchPackageException; 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; @@ -86,7 +88,8 @@ public class SkylarkRepositoryIntegrationTest extends BuildViewTestCase { new RepositoryDelegatorFunction( directories, repositoryHandlers, skylarkRepositoryFunction, new AtomicBoolean(true)), SkyFunctions.REPOSITORY, - new RepositoryLoaderFunction()); + new RepositoryLoaderFunction(), + FdoSupportValue.SKYFUNCTION, new FdoSupportFunction()); } @Override diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index 679d75de8d..abb31f7d11 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.rules.cpp; -import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.NULL_ACTION_OWNER; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -25,11 +24,9 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; -import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.util.ActionTester; import com.google.devtools.build.lib.analysis.util.ActionTester.ActionCombinationFactory; -import com.google.devtools.build.lib.analysis.util.AnalysisTestUtil; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -218,19 +215,14 @@ public class CppLinkActionTest extends BuildViewTestCase { || resources.getIoUsage() == scaledSet.getIoUsage()); } private Builder createLinkBuilder(Link.LinkTargetType type, String outputPath, - Iterable<Artifact> nonLibraryInputs, ImmutableList<LibraryToLink> libraryInputs) { - return createLinkBuilder(type, outputPath, nonLibraryInputs, libraryInputs, - AnalysisTestUtil.STUB_ANALYSIS_ENVIRONMENT); - } - - private Builder createLinkBuilder(Link.LinkTargetType type, String outputPath, - Iterable<Artifact> nonLibraryInputs, ImmutableList<LibraryToLink> libraryInputs, - AnalysisEnvironment analysisEnv) { - Builder builder = CppLinkAction.Builder.createTestBuilder( - NULL_ACTION_OWNER, - analysisEnv, + Iterable<Artifact> nonLibraryInputs, ImmutableList<LibraryToLink> libraryInputs) + throws Exception { + RuleContext ruleContext = createDummyRuleContext(); + Builder builder = new CppLinkAction.Builder( + ruleContext, new Artifact(new PathFragment(outputPath), getTargetConfiguration().getBinDirectory()), - getTargetConfiguration()) + ruleContext.getConfiguration(), + null) .addNonLibraryInputs(nonLibraryInputs) .addLibraries(NestedSetBuilder.wrap(Order.LINK_ORDER, libraryInputs)) .setLinkType(type) |