diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
7 files changed, 51 insertions, 39 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java index 6bc52b5315..ad9dc9bc06 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java @@ -25,7 +25,7 @@ import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.packages.License.LicenseType; -import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo; import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,7 +41,7 @@ public class AliasTest extends BuildViewTestCase { "alias(name='b', actual='a')"); ConfiguredTarget b = getConfiguredTarget("//a:b"); - assertThat(b.get(CcCompilationInfo.PROVIDER)).isNotNull(); + assertThat(b.get(CcCompilationContextInfo.PROVIDER)).isNotNull(); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index a2f2b736f9..25ef4feea1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -250,7 +250,7 @@ public class CcCommonTest extends BuildViewTestCase { "cc_library(name = 'defineslib',", " srcs = ['defines.cc'],", " defines = ['FOO', 'BAR'])"); - assertThat(isolatedDefines.get(CcCompilationInfo.PROVIDER).getDefines()) + assertThat(isolatedDefines.get(CcCompilationContextInfo.PROVIDER).getDefines()) .containsExactly("FOO", "BAR") .inOrder(); } @@ -418,7 +418,7 @@ public class CcCommonTest extends BuildViewTestCase { ConfiguredTarget foo = getConfiguredTarget("//bang:bang"); String includesRoot = "bang/bang_includes"; - assertThat(foo.get(CcCompilationInfo.PROVIDER).getSystemIncludeDirs()) + assertThat(foo.get(CcCompilationContextInfo.PROVIDER).getSystemIncludeDirs()) .containsAllOf( PathFragment.create(includesRoot), targetConfig.getGenfilesFragment().getRelative(includesRoot)); @@ -445,11 +445,11 @@ public class CcCommonTest extends BuildViewTestCase { String includesRoot = "bang/bang_includes"; List<PathFragment> expected = new ImmutableList.Builder<PathFragment>() - .addAll(noIncludes.get(CcCompilationInfo.PROVIDER).getSystemIncludeDirs()) + .addAll(noIncludes.get(CcCompilationContextInfo.PROVIDER).getSystemIncludeDirs()) .add(PathFragment.create(includesRoot)) .add(targetConfig.getGenfilesFragment().getRelative(includesRoot)) .build(); - assertThat(foo.get(CcCompilationInfo.PROVIDER).getSystemIncludeDirs()) + assertThat(foo.get(CcCompilationContextInfo.PROVIDER).getSystemIncludeDirs()) .containsExactlyElementsIn(expected); } @@ -858,10 +858,11 @@ public class CcCommonTest extends BuildViewTestCase { "cc_library(name='a', hdrs=['v1/b/c.h'], strip_include_prefix='v1', include_prefix='lib')"); ConfiguredTarget lib = getConfiguredTarget("//third_party/a"); - CcCompilationInfo ccCompilationInfo = lib.get(CcCompilationInfo.PROVIDER); - assertThat(ActionsTestUtil.prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs())) + CcCompilationContextInfo ccCompilationContextInfo = lib.get(CcCompilationContextInfo.PROVIDER); + assertThat( + ActionsTestUtil.prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs())) .containsExactly("third_party/a/_virtual_includes/a/lib/b/c.h"); - assertThat(ccCompilationInfo.getIncludeDirs()) + assertThat(ccCompilationContextInfo.getIncludeDirs()) .containsExactly( getTargetConfiguration() .getBinFragment() @@ -897,10 +898,10 @@ public class CcCommonTest extends BuildViewTestCase { "cc_library(name='relative', hdrs=['v1/b.h'], strip_include_prefix='v1')", "cc_library(name='absolute', hdrs=['v1/b.h'], strip_include_prefix='/third_party')"); - CcCompilationInfo relative = - getConfiguredTarget("//third_party/a:relative").get(CcCompilationInfo.PROVIDER); - CcCompilationInfo absolute = - getConfiguredTarget("//third_party/a:absolute").get(CcCompilationInfo.PROVIDER); + CcCompilationContextInfo relative = + getConfiguredTarget("//third_party/a:relative").get(CcCompilationContextInfo.PROVIDER); + CcCompilationContextInfo absolute = + getConfiguredTarget("//third_party/a:absolute").get(CcCompilationContextInfo.PROVIDER); assertThat(ActionsTestUtil.prettyArtifactNames(relative.getDeclaredIncludeSrcs())) .containsExactly("third_party/a/_virtual_includes/relative/b.h"); @@ -927,9 +928,10 @@ public class CcCommonTest extends BuildViewTestCase { "licenses(['notice'])", "cc_library(name='a', hdrs=['a.h'], include_prefix='third_party')"); - CcCompilationInfo ccCompilationInfo = - getConfiguredTarget("//third_party:a").get(CcCompilationInfo.PROVIDER); - assertThat(ActionsTestUtil.prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs())) + CcCompilationContextInfo ccCompilationContextInfo = + getConfiguredTarget("//third_party:a").get(CcCompilationContextInfo.PROVIDER); + assertThat( + ActionsTestUtil.prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs())) .doesNotContain("third_party/_virtual_includes/a/third_party/a.h"); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java index 8581414c4b..c6826d4b1b 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java @@ -283,7 +283,7 @@ public class CcImportConfiguredTargetTest extends BuildViewTestCase { "a", "foo", "cc_import(name = 'foo', static_library = 'libfoo.a', hdrs = ['foo.h'])") - .get(CcCompilationInfo.PROVIDER) + .get(CcCompilationContextInfo.PROVIDER) .getDeclaredIncludeSrcs(); assertThat(artifactsToStrings(headers)).containsExactly("src a/foo.h"); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java index 584a930867..3f36df1acf 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java @@ -90,13 +90,13 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { private CppModuleMapAction getCppModuleMapAction(String label) throws Exception { ConfiguredTarget target = getConfiguredTarget(label); - CppModuleMap cppModuleMap = target.get(CcCompilationInfo.PROVIDER).getCppModuleMap(); + CppModuleMap cppModuleMap = target.get(CcCompilationContextInfo.PROVIDER).getCppModuleMap(); return (CppModuleMapAction) getGeneratingAction(cppModuleMap.getArtifact()); } private void assertNoCppModuleMapAction(String label) throws Exception { ConfiguredTarget target = getConfiguredTarget(label); - assertThat(target.get(CcCompilationInfo.PROVIDER).getCppModuleMap()).isNull(); + assertThat(target.get(CcCompilationContextInfo.PROVIDER).getCppModuleMap()).isNull(); } @Test @@ -104,7 +104,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { ConfiguredTarget l = scratchConfiguredTarget("a", "l", "cc_library(name='l', srcs=['l.cc'], defines=['V=$(FOO)'], toolchains=[':v'])", "make_variable_tester(name='v', variables={'FOO': 'BAR'})"); - assertThat(l.get(CcCompilationInfo.PROVIDER).getDefines()).contains("V=BAR"); + assertThat(l.get(CcCompilationContextInfo.PROVIDER).getDefines()).contains("V=BAR"); } @Test @@ -559,7 +559,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { CppCompileAction aObjectAction = (CppCompileAction) getGeneratingAction(aObjectArtifact); assertThat(aObjectAction.getIncludeScannerSources()).containsExactly( getSourceArtifact("module/a.cc")); - assertThat(aObjectAction.getCcCompilationInfo().getTransitiveModules(true)) + assertThat(aObjectAction.getCcCompilationContextInfo().getTransitiveModules(true)) .contains(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); assertThat(aObjectAction.getInputs()).contains( getGenfilesArtifactWithNoOwner("module/b.cppmap")); @@ -751,7 +751,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { getConfiguredTarget("//module:j"); Artifact jObjectArtifact = getBinArtifact("_objs/j/module/j.pic.o", "//module:j"); CppCompileAction jObjectAction = (CppCompileAction) getGeneratingAction(jObjectArtifact); - assertThat(getHeaderModules(jObjectAction.getCcCompilationInfo().getTransitiveModules(true))) + assertThat( + getHeaderModules( + jObjectAction.getCcCompilationContextInfo().getTransitiveModules(true))) .containsExactly( getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"), getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g")); @@ -759,7 +761,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { getSourceArtifact("module/j.cc")); assertThat(jObjectAction.getMainIncludeScannerSource()).isEqualTo( getSourceArtifact("module/j.cc")); - assertThat(getHeaderModules(jObjectAction.getCcCompilationInfo().getTransitiveModules(true))) + assertThat( + getHeaderModules( + jObjectAction.getCcCompilationContextInfo().getTransitiveModules(true))) .containsExactly( getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b"), getBinArtifact("_objs/g/module/g.pic.pcm", "//module:g")); @@ -789,7 +793,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .containsExactly( getGenfilesArtifact("b.cppmap", "//module:b"), getGenfilesArtifact("c.cppmap", "//nomodule:e")); - assertThat(getHeaderModules(cObjectAction.getCcCompilationInfo().getTransitiveModules(true))) + assertThat( + getHeaderModules( + cObjectAction.getCcCompilationContextInfo().getTransitiveModules(true))) .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); getConfiguredTarget("//nomodule:d"); @@ -799,7 +805,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { .containsExactly( getGenfilesArtifact("c.cppmap", "//nomodule:c"), getGenfilesArtifact("d.cppmap", "//nomodule:d")); - assertThat(getHeaderModules(dObjectAction.getCcCompilationInfo().getTransitiveModules(true))) + assertThat( + getHeaderModules( + dObjectAction.getCcCompilationContextInfo().getTransitiveModules(true))) .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java index 3a8b07a08f..3f4602c6fd 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java @@ -57,7 +57,7 @@ public class CcToolchainProviderTest { /* dynamicRuntimeLinkInputs= */ NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), /* dynamicRuntimeLinkMiddleman= */ null, /* dynamicRuntimeSolibDir= */ PathFragment.EMPTY_FRAGMENT, - CcCompilationInfo.EMPTY, + CcCompilationContextInfo.EMPTY, /* supportsParamFiles= */ false, /* supportsHeaderParsing= */ false, Variables.EMPTY, @@ -91,7 +91,7 @@ public class CcToolchainProviderTest { /* dynamicRuntimeLinkInputs= */ NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), /* dynamicRuntimeLinkMiddleman= */ null, /* dynamicRuntimeSolibDir= */ PathFragment.EMPTY_FRAGMENT, - CcCompilationInfo.EMPTY, + CcCompilationContextInfo.EMPTY, /* supportsParamFiles= */ false, /* supportsHeaderParsing= */ false, Variables.EMPTY, diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java index cc268eb805..a0d9c80659 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java @@ -20,7 +20,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo.Builder; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo.Builder; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @@ -39,7 +39,8 @@ public final class MockCppSemantics implements CppSemantics { RuleContext ruleContext, CppCompileActionBuilder actionBuilder) {} @Override - public void setupCcCompilationInfo(RuleContext ruleContext, Builder ccCompilationInfoBuilder) {} + public void setupCcCompilationContextInfo( + RuleContext ruleContext, Builder ccCompilationContextInfoBuilder) {} @Override public NestedSet<Artifact> getAdditionalPrunableIncludes() { diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java index f16d5c8314..0a601e0dd8 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java @@ -24,7 +24,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; -import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo; import com.google.devtools.build.lib.vfs.FileSystemUtils; import org.junit.Before; import org.junit.Test; @@ -107,23 +107,23 @@ public class CcProtoLibraryTest extends BuildViewTestCase { "proto_library(name = 'alias_proto', deps = [':foo_proto'])", "proto_library(name = 'foo_proto', srcs = ['foo.proto'])"); - CcCompilationInfo ccCompilationInfo = - getConfiguredTarget("//x:foo_cc_proto").get(CcCompilationInfo.PROVIDER); - assertThat(prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs())) + CcCompilationContextInfo ccCompilationContextInfo = + getConfiguredTarget("//x:foo_cc_proto").get(CcCompilationContextInfo.PROVIDER); + assertThat(prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs())) .containsExactly("x/foo.pb.h"); } @Test - public void ccCompilationInfo() throws Exception { + public void ccCompilationContextInfo() throws Exception { scratch.file( "x/BUILD", "cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])", "proto_library(name = 'foo_proto', srcs = ['foo.proto'], deps = [':bar_proto'])", "proto_library(name = 'bar_proto', srcs = ['bar.proto'])"); - CcCompilationInfo ccCompilationInfo = - getConfiguredTarget("//x:foo_cc_proto").get(CcCompilationInfo.PROVIDER); - assertThat(prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs())) + CcCompilationContextInfo ccCompilationContextInfo = + getConfiguredTarget("//x:foo_cc_proto").get(CcCompilationContextInfo.PROVIDER); + assertThat(prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs())) .containsExactly("x/foo.pb.h", "x/bar.pb.h"); } @@ -173,8 +173,9 @@ public class CcProtoLibraryTest extends BuildViewTestCase { getTargetConfiguration().getGenfilesFragment().toString())); Artifact headerFile = getGenfilesArtifactWithNoOwner("external/bla/foo/bar.pb.h"); - CcCompilationInfo ccCompilationInfo = target.get(CcCompilationInfo.PROVIDER); - assertThat(ccCompilationInfo.getDeclaredIncludeSrcs()).containsExactly(headerFile); + CcCompilationContextInfo ccCompilationContextInfo = + target.get(CcCompilationContextInfo.PROVIDER); + assertThat(ccCompilationContextInfo.getDeclaredIncludeSrcs()).containsExactly(headerFile); } @Test |