diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
4 files changed, 79 insertions, 66 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 f3525b3e4c..ca994963a8 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 @@ -165,6 +165,11 @@ public final class BazelAnalysisMock extends AnalysisMock { "cc_binary(name='launcher', srcs=['launcher_main.cc'])"); config.create( + "/bazel_tools_workspace/tools/def_parser/BUILD", + "package(default_visibility=['//visibility:public'])", + "filegroup(name='def_parser', srcs=['def_parser.exe'])"); + + config.create( "/bazel_tools_workspace/objcproto/BUILD", "package(default_visibility=['//visibility:public'])", "objc_library(", 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 adf4d3d1ff..51a46ccb62 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 @@ -189,7 +189,8 @@ public class CcCommonTest extends BuildViewTestCase { "archive_in_srcs_test", "cc_test(name = 'archive_in_srcs_test',", " srcs = ['archive_in_srcs_test.cc'],", - " deps = [':archive_in_srcs_lib'])", + " deps = [':archive_in_srcs_lib'],", + " linkstatic = 0,)", "cc_library(name = 'archive_in_srcs_lib',", " srcs = ['libstatic.a', 'libboth.a', 'libboth.so'])"); List<String> artifactNames = baseArtifactNames(getLinkerInputs(archiveInSrcsTest)); 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 9b8b814a9d..20891db1b5 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 @@ -33,61 +33,65 @@ import org.junit.runners.JUnit4; public class CcToolchainProviderTest { @Test public void equalityIsObjectIdentity() throws Exception { - CcToolchainProvider a = new CcToolchainProvider( - null, - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - null, - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - null, - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - null, - PathFragment.EMPTY_FRAGMENT, - CppCompilationContext.EMPTY, - false, - false, - ImmutableMap.<String, String>of(), - ImmutableList.<Artifact>of(), - NestedSetBuilder.<Pair<String, String>>emptySet(Order.COMPILE_ORDER), - null, - ImmutableMap.<String, String>of(), - ImmutableList.<PathFragment>of(), - null); + CcToolchainProvider a = + new CcToolchainProvider( + null, + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + null, + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + null, + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + null, + PathFragment.EMPTY_FRAGMENT, + CppCompilationContext.EMPTY, + false, + false, + ImmutableMap.<String, String>of(), + ImmutableList.<Artifact>of(), + NestedSetBuilder.<Pair<String, String>>emptySet(Order.COMPILE_ORDER), + null, + null, + ImmutableMap.<String, String>of(), + ImmutableList.<PathFragment>of(), + null); - CcToolchainProvider b = new CcToolchainProvider( - null, - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - null, - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - null, - NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), - null, - PathFragment.EMPTY_FRAGMENT, - CppCompilationContext.EMPTY, - false, - false, - ImmutableMap.<String, String>of(), - ImmutableList.<Artifact>of(), - NestedSetBuilder.<Pair<String, String>>emptySet(Order.COMPILE_ORDER), - null, - ImmutableMap.<String, String>of(), - ImmutableList.<PathFragment>of(), - null); + CcToolchainProvider b = + new CcToolchainProvider( + null, + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + null, + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + null, + NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), + null, + PathFragment.EMPTY_FRAGMENT, + CppCompilationContext.EMPTY, + false, + false, + ImmutableMap.<String, String>of(), + ImmutableList.<Artifact>of(), + NestedSetBuilder.<Pair<String, String>>emptySet(Order.COMPILE_ORDER), + null, + null, + ImmutableMap.<String, String>of(), + ImmutableList.<PathFragment>of(), + null); new EqualsTester() .addEqualityGroup(a) diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppOutputGroupsTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppOutputGroupsTest.java index 5110bddd36..9d8e537dab 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppOutputGroupsTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppOutputGroupsTest.java @@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -34,8 +33,8 @@ public class CppOutputGroupsTest extends BuildViewTestCase { scratch.file( "a/BUILD", "cc_library(name='lib', srcs=['src.cc'], linkstatic=1, alwayslink=0)", - "filegroup(name='group_archive', srcs=[':lib'], output_group = 'archive')", - "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'dynamic_library')"); + "filegroup(name='group_archive', srcs=[':lib'], output_group = 'cc_archive')", + "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'cc_dynamic_library')"); ConfiguredTarget groupArchive = getConfiguredTarget("//a:group_archive"); ConfiguredTarget groupDynamic = getConfiguredTarget("//a:group_dynamic"); @@ -51,8 +50,8 @@ public class CppOutputGroupsTest extends BuildViewTestCase { scratch.file( "a/BUILD", "cc_library(name='lib', srcs=['src.cc'], linkstatic=1, alwayslink=1)", - "filegroup(name='group_archive', srcs=[':lib'], output_group = 'archive')", - "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'dynamic_library')"); + "filegroup(name='group_archive', srcs=[':lib'], output_group = 'cc_archive')", + "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'cc_dynamic_library')"); ConfiguredTarget groupArchive = getConfiguredTarget("//a:group_archive"); ConfiguredTarget groupDynamic = getConfiguredTarget("//a:group_dynamic"); @@ -68,16 +67,18 @@ public class CppOutputGroupsTest extends BuildViewTestCase { scratch.file( "a/BUILD", "cc_library(name='lib', srcs=['src.cc'], linkstatic=0, alwayslink=0)", - "filegroup(name='group_archive', srcs=[':lib'], output_group = 'archive')", - "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'dynamic_library')"); + "filegroup(name='group_archive', srcs=[':lib'], output_group = 'cc_archive')", + "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'cc_dynamic_library')"); ConfiguredTarget groupArchive = getConfiguredTarget("//a:group_archive"); ConfiguredTarget groupDynamic = getConfiguredTarget("//a:group_dynamic"); assertThat(ActionsTestUtil.prettyArtifactNames(getFilesToBuild(groupArchive))) .containsExactly("a/liblib.a"); + // If supports_interface_shared_objects is true, .ifso could also be generated. + // So we here use contains instead containsExactly. assertThat(ActionsTestUtil.prettyArtifactNames(getFilesToBuild(groupDynamic))) - .containsExactly("a/liblib.so"); + .contains("a/liblib.so"); } @Test @@ -86,15 +87,17 @@ public class CppOutputGroupsTest extends BuildViewTestCase { scratch.file( "a/BUILD", "cc_library(name='lib', srcs=['src.cc'], linkstatic=0, alwayslink=1)", - "filegroup(name='group_archive', srcs=[':lib'], output_group = 'archive')", - "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'dynamic_library')"); + "filegroup(name='group_archive', srcs=[':lib'], output_group = 'cc_archive')", + "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'cc_dynamic_library')"); ConfiguredTarget groupArchive = getConfiguredTarget("//a:group_archive"); ConfiguredTarget groupDynamic = getConfiguredTarget("//a:group_dynamic"); assertThat(ActionsTestUtil.prettyArtifactNames(getFilesToBuild(groupArchive))) .containsExactly("a/liblib.lo"); + // If supports_interface_shared_objects is true, .ifso could also be generated. + // So we here use contains instead containsExactly. assertThat(ActionsTestUtil.prettyArtifactNames(getFilesToBuild(groupDynamic))) - .containsExactly("a/liblib.so"); + .contains("a/liblib.so"); } } |