fix(build): move BUILD rules next to go code (#5009)

kythe · Aug 2, 2021 · 3dc332b · 3dc332b
1 parent fd30e09
commit 3dc332b
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 58 deletions.
diff --git a/kythe/cxx/common/testdata/BUILD b/kythe/cxx/common/testdata/BUILD
@@ -17,7 +17,7 @@ shell_tool_test(
     scriptfile = "net_client_test_runner.sh",
     tools = {
         "KYTHE_ENTRYSTREAM": "//kythe/go/platform/tools/entrystream",
-        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools:http_server",
+        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools/http_server",
         "KYTHE_WRITE_ENTRIES": "//kythe/go/storage/tools:write_entries",
         "KYTHE_WRITE_TABLES": "//kythe/go/serving/tools:write_tables",
     },

diff --git a/kythe/cxx/common/testdata/start_http_service.sh b/kythe/cxx/common/testdata/start_http_service.sh
@@ -39,7 +39,7 @@
 #   "//kythe/go/platform/tools:entrystream",
 #   "//kythe/go/storage/tools:write_tables",
 #   "//kythe/go/storage/tools:write_entries",
-#   "//kythe/go/test/tools:http_server",
+#   "//kythe/go/test/tools/http_server",
 
 set -e
 

diff --git a/kythe/cxx/indexer/cxx/testdata/BUILD b/kythe/cxx/indexer/cxx/testdata/BUILD
@@ -888,10 +888,10 @@ sh_test(
     data = [
         ":vname_corpus_entries.entries.gz",
         "//kythe/go/platform/tools/entrystream",
-        "//kythe/go/test/tools:empty_corpus_checker",
+        "//kythe/go/test/tools/empty_corpus_checker",
     ],
     env = {
-        "EMPTY_CORPUS_CHECKER": "$(location //kythe/go/test/tools:empty_corpus_checker)",
+        "EMPTY_CORPUS_CHECKER": "$(location //kythe/go/test/tools/empty_corpus_checker)",
         "ENTRYSTREAM": "$(location //kythe/go/platform/tools/entrystream)",
     },
 )

diff --git a/kythe/cxx/tools/fyi/testdata/BUILD b/kythe/cxx/tools/fyi/testdata/BUILD
@@ -27,7 +27,7 @@ shell_tool_test(
     tools = {
         "FYI": "//kythe/cxx/tools/fyi",
         "KYTHE_ENTRYSTREAM": "//kythe/go/platform/tools/entrystream",
-        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools:http_server",
+        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools/http_server",
         "KYTHE_WRITE_ENTRIES": "//kythe/go/storage/tools:write_entries",
         "KYTHE_WRITE_TABLES": "//kythe/go/serving/tools:write_tables",
     },
@@ -48,7 +48,7 @@ shell_tool_test(
     tools = {
         "FYI": "//kythe/cxx/tools/fyi",
         "KYTHE_ENTRYSTREAM": "//kythe/go/platform/tools/entrystream",
-        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools:http_server",
+        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools/http_server",
         "KYTHE_WRITE_ENTRIES": "//kythe/go/storage/tools:write_entries",
         "KYTHE_WRITE_TABLES": "//kythe/go/serving/tools:write_tables",
     },
@@ -68,7 +68,7 @@ shell_tool_test(
     tools = {
         "FYI": "//kythe/cxx/tools/fyi",
         "KYTHE_ENTRYSTREAM": "//kythe/go/platform/tools/entrystream",
-        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools:http_server",
+        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools/http_server",
         "KYTHE_WRITE_ENTRIES": "//kythe/go/storage/tools:write_entries",
         "KYTHE_WRITE_TABLES": "//kythe/go/serving/tools:write_tables",
     },

diff --git a/kythe/go/serving/tools/testdata/BUILD b/kythe/go/serving/tools/testdata/BUILD
@@ -48,7 +48,7 @@ shell_tool_test(
         "JQ": "@com_github_stedolan_jq//:jq",
         "KWAZTHIS": "//kythe/go/serving/tools:kwazthis",
         "KYTHE_ENTRYSTREAM": "//kythe/go/platform/tools/entrystream",
-        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools:http_server",
+        "KYTHE_HTTP_SERVER": "//kythe/go/test/tools/http_server",
         "KYTHE_WRITE_ENTRIES": "//kythe/go/storage/tools:write_entries",
         "KYTHE_WRITE_TABLES": "//kythe/go/serving/tools:write_tables",
     },

diff --git a/kythe/go/test/tools/BUILD b/kythe/go/test/tools/BUILD
diff --git a/kythe/go/test/tools/empty_corpus_checker/BUILD b/kythe/go/test/tools/empty_corpus_checker/BUILD
@@ -0,0 +1,19 @@
+load("//tools:build_rules/shims.bzl", "go_binary")
+
+package(default_visibility = ["//kythe:default_visibility"])
+
+go_binary(
+    name = "empty_corpus_checker",
+    srcs = ["empty_corpus_checker.go"],
+    deps = [
+        "//kythe/go/platform/delimited",
+        "//kythe/go/storage/entryset",
+        "//kythe/go/storage/stream",
+        "//kythe/go/util/flagutil",
+        "//kythe/go/util/kytheuri",
+        "//kythe/go/util/schema/facts",
+        "//kythe/proto:internal_go_proto",
+        "//kythe/proto:storage_go_proto",
+        "@org_golang_google_protobuf//proto:go_default_library",
+    ],
+)
diff --git a/kythe/go/test/tools/http_server/BUILD b/kythe/go/test/tools/http_server/BUILD
@@ -0,0 +1,19 @@
+load("//tools:build_rules/shims.bzl", "go_binary")
+
+package(default_visibility = ["//kythe:default_visibility"])
+
+go_binary(
+    name = "http_server",
+    srcs = ["http_server.go"],
+    deps = [
+        "//kythe/go/services/filetree",
+        "//kythe/go/services/graph",
+        "//kythe/go/services/web",
+        "//kythe/go/services/xrefs",
+        "//kythe/go/serving/filetree",
+        "//kythe/go/serving/graph",
+        "//kythe/go/serving/xrefs",
+        "//kythe/go/storage/leveldb",
+        "//kythe/go/storage/table",
+    ],
+)
diff --git a/kythe/go/test/tools/xrefs_atomizer/BUILD b/kythe/go/test/tools/xrefs_atomizer/BUILD
@@ -0,0 +1,17 @@
+load("//tools:build_rules/shims.bzl", "go_binary")
+
+package(default_visibility = ["//kythe:default_visibility"])
+
+go_binary(
+    name = "xrefs_atomizer",
+    srcs = ["xrefs_atomizer.go"],
+    deps = [
+        "//kythe/go/platform/delimited",
+        "//kythe/go/services/xrefs",
+        "//kythe/go/serving/api",
+        "//kythe/go/test/services/xrefs",
+        "//kythe/go/util/schema/facts",
+        "//kythe/proto:storage_go_proto",
+        "//kythe/proto:xref_go_proto",
+    ],
+)
diff --git a/tools/build_rules/verifier_test/verifier_test.bzl b/tools/build_rules/verifier_test/verifier_test.bzl
@@ -97,7 +97,7 @@ atomize_entries = rule(
             providers = ["kythe_entries"],
         ),
         "_atomizer": attr.label(
-            default = Label("//kythe/go/test/tools:xrefs_atomizer"),
+            default = Label("//kythe/go/test/tools/xrefs_atomizer"),
             executable = True,
             cfg = "host",
         ),