Fix tests with cc_libary before Starlark flip

RELNOTES:none
PiperOrigin-RevId: 430657236

Author: oquenchil

src/test/java/com/google/devtools/build/lib/buildtool/KeepGoingTest.java

@@ -248,6 +248,7 @@ public void testKeepGoingOnSecondBuild() throws Exception {
 
   @Test
   public void testConfigurationErrorsAreToleratedWithKeepGoing() throws Exception {
+    runtimeWrapper.addOptions("--experimental_builtins_injection_override=+cc_library");
     write("a/BUILD", "cc_library(name='a', srcs=['missing.foo'])");
     write("b/BUILD", "cc_library(name='b')");
 
@@ -258,7 +259,8 @@ public void testConfigurationErrorsAreToleratedWithKeepGoing() throws Exception
     assertBuildFailedExceptionFromBuilding(
         "command succeeded, but not all targets were analyzed", "//a", "//b");
     events.assertContainsError(
-        "in srcs attribute of cc_library rule //a:a: " + "target '//a:missing.foo' does not exist");
+        "in srcs attribute of cc_library rule //a:a: source file '//a:missing.foo' is misplaced"
+            + " here");
     events.assertContainsInfo("Analysis succeeded for only 1 of 2 top-level targets");
 
     assertSameConfiguredTarget("//b:b");

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

@@ -52,6 +52,7 @@ public void testAcceptsDependencyWithAtLeastOneGoodSource() throws Exception {
 
   @Test
   public void testRejectsBadGeneratedFile() throws Exception {
+    setBuildLanguageOptions("--experimental_builtins_injection_override=+cc_library");
     reporter.removeHandler(failFastHandler);
     scratch.file("dependency/BUILD",
         "genrule(name = 'generated', ",
@@ -62,6 +63,8 @@ public void testRejectsBadGeneratedFile() throws Exception {
         "           srcs = ['//dependency:generated'])");
     configure("//foo:foo");
     assertContainsEvent(
-        getErrorMsgNoGoodFiles("srcs", "cc_library", "//foo:foo", "//dependency:generated"));
+        String.format(
+            "attribute srcs: '%s' does not produce any cc_library srcs files",
+            "//dependency:generated"));
   }
 }

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

@@ -34,7 +34,7 @@ private CcStarlarkApiProvider getApi(String label) throws Exception {
     return (CcStarlarkApiProvider) rule.get(CcStarlarkApiProvider.NAME);
   }
 
-  private CcStarlarkApiInfo getApiForCcBinary(String label) throws Exception {
+  private CcStarlarkApiInfo getApiForBuiltin(String label) throws Exception {
     RuleConfiguredTarget rule = (RuleConfiguredTarget) getConfiguredTarget(label);
     return (CcStarlarkApiInfo) rule.get(CcStarlarkApiProvider.NAME);
   }
@@ -104,7 +104,9 @@ public void testDisableInCcProtoLibrary() throws Exception {
 
   @Test
   public void testTransitiveHeaders() throws Exception {
-    setBuildLanguageOptions("--experimental_builtins_injection_override=+cc_binary");
+    setBuildLanguageOptions(
+        "--experimental_builtins_injection_override=+cc_binary",
+        "--experimental_builtins_injection_override=+cc_library");
     useConfiguration("--noincompatible_disable_legacy_cc_provider");
     scratch.file(
         "pkg/BUILD",
@@ -119,15 +121,19 @@ public void testTransitiveHeaders() throws Exception {
         ")");
     assertThat(
             ActionsTestUtil.baseArtifactNames(
-                getApiForCcBinary("//pkg:check").getTransitiveHeaders()))
+                getApiForBuiltin("//pkg:check").getTransitiveHeaders()))
         .containsAtLeast("lib.h", "bin.h");
-    assertThat(ActionsTestUtil.baseArtifactNames(getApi("//pkg:check_lib").getTransitiveHeaders()))
+    assertThat(
+            ActionsTestUtil.baseArtifactNames(
+                getApiForBuiltin("//pkg:check_lib").getTransitiveHeaders()))
         .contains("lib.h");
   }
 
   @Test
   public void testLinkFlags() throws Exception {
-    setBuildLanguageOptions("--experimental_builtins_injection_override=+cc_binary");
+    setBuildLanguageOptions(
+        "--experimental_builtins_injection_override=+cc_binary",
+        "--experimental_builtins_injection_override=+cc_library");
     useConfiguration("--noincompatible_disable_legacy_cc_provider");
     scratch.file(
         "pkg/BUILD",
@@ -152,18 +158,19 @@ public void testLinkFlags() throws Exception {
         "    defines = ['foo'],",
         "    linkopts = ['-Wl,-M'],",
         ")");
-    assertThat(getApi("//pkg:check_lib").getLinkopts())
-        .contains("-Wl,-M");
-    assertThat(getApi("//pkg:dependent_lib").getLinkopts())
+    assertThat(getApiForBuiltin("//pkg:check_lib").getLinkopts()).contains("-Wl,-M");
+    assertThat(getApiForBuiltin("//pkg:dependent_lib").getLinkopts())
         .containsAtLeast("-lz", "-Wl,-M")
         .inOrder();
-    assertThat(getApiForCcBinary("//pkg:check").getLinkopts()).isEmpty();
-    assertThat(getApiForCcBinary("//pkg:check_no_srcs").getLinkopts()).isEmpty();
+    assertThat(getApiForBuiltin("//pkg:check").getLinkopts()).isEmpty();
+    assertThat(getApiForBuiltin("//pkg:check_no_srcs").getLinkopts()).isEmpty();
   }
 
   @Test
   public void testLibraries() throws Exception {
-    setBuildLanguageOptions("--experimental_builtins_injection_override=+cc_binary");
+    setBuildLanguageOptions(
+        "--experimental_builtins_injection_override=+cc_binary",
+        "--experimental_builtins_injection_override=+cc_library");
     useConfiguration("--noincompatible_disable_legacy_cc_provider");
     scratch.file(
         "pkg/BUILD",
@@ -180,13 +187,14 @@ public void testLibraries() throws Exception {
         "    name = 'check_lib',",
         "    srcs = ['lib.cc', 'lib.h'],",
         ")");
-    assertThat(ActionsTestUtil.baseArtifactNames(getApi("//pkg:check_lib").getLibraries()))
+    assertThat(
+            ActionsTestUtil.baseArtifactNames(getApiForBuiltin("//pkg:check_lib").getLibraries()))
         .containsExactly("libcheck_lib.a");
-    assertThat(ActionsTestUtil.baseArtifactNames(getApiForCcBinary("//pkg:check").getLibraries()))
+    assertThat(ActionsTestUtil.baseArtifactNames(getApiForBuiltin("//pkg:check").getLibraries()))
         .isEmpty();
     assertThat(
             ActionsTestUtil.baseArtifactNames(
-                getApiForCcBinary("//pkg:check_no_srcs").getLibraries()))
+                getApiForBuiltin("//pkg:check_no_srcs").getLibraries()))
         .isEmpty();
   }
 
@@ -205,7 +213,7 @@ public void testCcFlags() throws Exception {
         "    name = 'check_lib',",
         "    defines = ['foo'],",
         ")");
-    assertThat(getApiForCcBinary("//pkg:check").getCcFlags()).contains("-Dfoo");
+    assertThat(getApiForBuiltin("//pkg:check").getCcFlags()).contains("-Dfoo");
   }
 
   @Test