From 7bd9f319210cc564f6507a45b226def5947591d1 Mon Sep 17 00:00:00 2001
From: Simon Stewart <simon.m.stewart@gmail.com>
Date: Mon, 7 Sep 2020 12:06:04 +0100
Subject: [PATCH] [bazel] Use the name of the test suite if possible to create
 a target

---
 java/private/test.bzl | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/java/private/test.bzl b/java/private/test.bzl
index 9220e57d70a54..384675d62aaa9 100644
--- a/java/private/test.bzl
+++ b/java/private/test.bzl
@@ -108,9 +108,17 @@ def java_test_suite(
                 **kwargs
             )
 
-    native.test_suite(
-        name = "%s-suite" % name,
-        tests = tests,
-        tags = ["manual"] + tags,
-        visibility = visibility,
-    )
+    if name in srcs:
+      native.test_suite(
+          name = "%s-suite" % name,
+          tests = tests,
+          tags = ["manual"] + tags,
+          visibility = visibility,
+      )
+    else:
+        native.test_suite(
+          name = name,
+          tests = tests,
+          tags = ["manual"] + tags,
+          visibility = visibility,
+        )