From 5631c7e2b6c5f2cda2388e66b5397a42ccc4ade7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@uber.com>
Date: Thu, 3 Feb 2022 14:36:22 +0200
Subject: [PATCH] build everything under //test/... and remove duplicate test
 binaries

---
 ci/test    | 13 ++++++++++---
 test/BUILD | 36 ++++++++++++++----------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/ci/test b/ci/test
index 1913b40..070f757 100755
--- a/ci/test
+++ b/ci/test
@@ -13,10 +13,17 @@ _test() {
     local glob=$2
     shift; shift;
     >&2 echo "================================================================"
-    >&2 echo "Testing $name and looking for '$glob':"
-    >&2 echo "  bazel build $* //test:hello"
+    >&2 echo "Building everything under //test/... for $name"
     >&2 echo
-    if _build_and_file "$@" //test:hello | grep -q "$glob"; then
+    >&2 echo "  bazel build --color=yes --curses=yes $* //test/..."
+    >&2 echo
+    bazel build --color=yes --curses=yes "$@" //test/...
+    >&2 echo
+    >&2 echo "Testing $name and looking for '$glob':"
+    >&2 echo
+    >&2 echo "  bazel build $* //test:test"
+    >&2 echo
+    if _build_and_file "$@" //test:test | grep -q "$glob"; then
         >&2 echo "OK $name"
         return 0
     else
diff --git a/test/BUILD b/test/BUILD
index 8c8cf94..10f2b7d 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -1,26 +1,5 @@
-load("//rules:rules_go.bzl", "go_binary")
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "hello_lib",
-    srcs = ["hello.go"],
-    cgo = True,
-    importpath = "github.com/motiejus/bazel-zig-cc/test",
-    visibility = ["//visibility:private"],
-)
-
-go_binary(
-    name = "hello",
-    embed = [":test_lib"],
-    static = "on",
-    visibility = ["//visibility:public"],
-)
-
-go_test(
-    name = "test_test",
-    srcs = ["hello_test.go"],
-    embed = [":test_lib"],
-)
+load("//rules:rules_go.bzl", "go_binary")
 
 go_library(
     name = "test_lib",
@@ -29,3 +8,16 @@ go_library(
     importpath = "git.sr.ht/~motiejus/bazel-zig-cc/test",
     visibility = ["//visibility:private"],
 )
+
+go_binary(
+    name = "test",
+    static = "on",
+    embed = [":test_lib"],
+    visibility = ["//visibility:public"],
+)
+
+go_test(
+    name = "test_test",
+    srcs = ["hello_test.go"],
+    embed = [":test_lib"],
+)