Internal change

PiperOrigin-RevId: 882600278
Change-Id: I00fd17bba015a021a2eafae3d2627742a3e8ff3f

Author: cushon

src/test/java/com/google/devtools/build/lib/analysis/config/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_java//java:java_library.bzl", "java_library")
+load("@rules_java//java:java_test.bzl", "java_test")
 
 package(
     default_applicable_licenses = ["//:license"],
@@ -102,8 +103,8 @@ java_test(
     ],
 )
 
-java_test(
-    name = "BuildOptionsTest",
+java_library(
+    name = "BuildOptionsTestLib",
     srcs = ["BuildOptionsTest.java"],
     deps = [
         "//src/main/java/com/google/devtools/build/lib/analysis/config:build_options",
@@ -120,6 +121,14 @@ java_test(
     ],
 )
 
+java_test(
+    name = "BuildOptionsTest",
+    test_class = "com.google.devtools.build.lib.analysis.config.BuildOptionsTest",
+    runtime_deps = [
+        ":BuildOptionsTestLib",
+    ],
+)
+
 java_test(
     name = "BuildOptionsViewTest",
     srcs = ["BuildOptionsViewTest.java"],

src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD

@@ -76,8 +76,8 @@ java_test(
     ],
 )
 
-java_test(
-    name = "BuildEventServiceTransportGrpcTest",
+java_library(
+    name = "BuildEventServiceTransportGrpcTestLib",
     srcs = ["BuildEventServiceTransportGrpcTest.java"],
     deps = [
         ":AbstractBuildEventServiceTransportTest",
@@ -95,6 +95,14 @@ java_test(
     ],
 )
 
+java_test(
+    name = "BuildEventServiceTransportGrpcTest",
+    test_class = "com.google.devtools.build.lib.buildeventservice.BuildEventServiceTransportGrpcTest",
+    runtime_deps = [
+        ":BuildEventServiceTransportGrpcTestLib",
+    ],
+)
+
 java_test(
     name = "BazelBuildEventServiceModuleTest",
     srcs = ["BazelBuildEventServiceModuleTest.java"],

src/test/java/com/google/devtools/build/lib/skyframe/config/BUILD

@@ -46,7 +46,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/skyframe/config",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/test/java/com/google/devtools/build/lib/analysis/config:BuildOptionsTest",
+        "//src/test/java/com/google/devtools/build/lib/analysis/config:BuildOptionsTestLib",
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",