commit 3b49b93c15b858b7a5fa85ac489234761a8b9848
author Augie Fackler <augie@google.com> Mon Apr 29 06:44:15 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 29 06:45:25 2024 -0700
tree c9506d78ddcb9eb159cd5929770fd60ae5ec97f8
parent 92e21f446bfe8e8deda8d969bac7c15d00486cbc

Internal change.

PiperOrigin-RevId: 629052392
Change-Id: I35b5b5e9744bb03bfaf80228169b9ef69528578b

src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java
index 4eb824e..613d9b1 100755
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java
@@ -1634,7 +1634,7 @@
                     CppRuleClasses.SUPPORTS_PIC,
                     CppRuleClasses.SUPPORTS_DYNAMIC_LINKER));
     this.setBuildLanguageOptions("--incompatible_depset_for_libraries_to_link_getter");
-    setUpCcLinkingContextTest(false);
+    setUpCcLinkingContextTest();
     ConfiguredTarget a = getConfiguredTarget("//a:a");
     StructImpl info = ((StructImpl) getMyInfoFromTarget(a).getValue("info"));
 
@@ -1666,7 +1666,7 @@
 
   @Test
   public void testSolibLinkDefault() throws Exception {
-    setUpCcLinkingContextTest(false);
+    setUpCcLinkingContextTest();
     scratch.file(
         "foo/BUILD",
         """
@@ -1708,7 +1708,7 @@
 
   @Test
   public void testSolibLinkCustom() throws Exception {
-    setUpCcLinkingContextTest(false);
+    setUpCcLinkingContextTest();
     scratch.file(
         "foo/BUILD",
         """
@@ -1757,7 +1757,7 @@
 
   @Test
   public void testReallyLongSolibLink() throws Exception {
-    setUpCcLinkingContextTest(false);
+    setUpCcLinkingContextTest();
 
     String longpath =
         "this/is/a/really/really/really/really/really/really/really/really/really/really/"
@@ -1791,7 +1791,7 @@
       throws Exception {
     useConfiguration("--features=-supports_interface_shared_libraries");
     this.setBuildLanguageOptions("--incompatible_depset_for_libraries_to_link_getter");
-    setUpCcLinkingContextTest(false);
+    setUpCcLinkingContextTest();
     ConfiguredTarget a = getConfiguredTarget("//a:a");
 
     StructImpl info = ((StructImpl) getMyInfoFromTarget(a).getValue("info"));
@@ -1851,10 +1851,7 @@
     assertThat(bin).isNotNull();
   }
 
-  private void setUpCcLinkingContextTest(boolean enableExperimentalCcImport) throws Exception {
-    if (enableExperimentalCcImport) {
-      useConfiguration("--experimental_starlark_cc_import");
-    }
+  private void setUpCcLinkingContextTest() throws Exception {
     scratch.file(
         "a/BUILD",
         """
@@ -1963,8 +1960,6 @@
         "    dynamic_library_symlink_path=dynamic_library_symlink_path,",
         "    interface_library_symlink_path=interface_library_symlink_path,",
         "    alwayslink=alwayslink, ",
-        enableExperimentalCcImport ? "    objects=objects, " : "",
-        enableExperimentalCcImport ? "    pic_objects=pic_objects" : "",
         "    )",
         "def _impl(ctx):",
         "  toolchain = find_cc_toolchain(ctx)",
@@ -5585,7 +5580,7 @@
 
   @Test
   public void testWrongExtensionThrowsError() throws Exception {
-    setUpCcLinkingContextTest(false);
+    setUpCcLinkingContextTest();
     scratch.file(
         "foo/BUILD",
         """
@@ -6980,7 +6975,7 @@
   @Test
   public void testMixedLinkerInputsWithOwnerAndWithout() throws Exception {
     setBuildLanguageOptions("--noincompatible_require_linker_input_cc_api");
-    setUpCcLinkingContextTest(false);
+    setUpCcLinkingContextTest();
     scratch.file(
         "foo/BUILD",
         """