From 9c17adc7c7323d8ced7bf73c27ea406308b8b553 Mon Sep 17 00:00:00 2001
From: michajlo <michajlo@google.com>
Date: Wed, 16 Jun 2021 15:03:20 -0700
Subject: [PATCH] Clean up and consolidate BUILD files

WRT windows tests, copy pasting from another change...

This does unfortunately remove tests from `all_windows_tests`, which seems like it's
suffering from some bitrot (https://github.com/bazelbuild/bazel/issues/4292#issuecomment-860914458). We _could_ explicitly add the tests, and while it's bound to be an
unpopular opinion, I think we should avoid setting the precedent of explicitly
enumerating windows tests as it's unlikely to scale.

PiperOrigin-RevId: 379819307
---
 .../google/devtools/build/lib/skyframe/BUILD  |  1 -
 .../build/lib/skyframe/serialization/BUILD    | 33 ++-----------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index f6af4aece0bed5..ff8925734a425e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -359,7 +359,6 @@ test_suite(
     tests = [
         ":windows_tests",
         "//src/test/java/com/google/devtools/build/lib/skyframe/packages:all_windows_tests",
-        "//src/test/java/com/google/devtools/build/lib/skyframe/serialization:all_windows_tests",
     ],
     visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
 )
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
index 4bf91235e2ad30..5fc39703aab997 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
@@ -1,38 +1,28 @@
 load("@rules_java//java:defs.bzl", "java_library", "java_test")
 
-package(
-    default_testonly = 1,
-    default_visibility = ["//src:__subpackages__"],
-)
+package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "srcs",
     testonly = 0,
     srcs = glob(["**"]),
-    visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
+    visibility = ["//src:__subpackages__"],
 )
 
 java_library(
     name = "serialization-tests",
     testonly = 1,
-    srcs = glob(["*.java"]),
+    srcs = glob(["**/*.java"]),
     deps = [
-        "//src/main/java/com/google/devtools/build/lib/bugreport",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/events",
-        "//src/main/java/com/google/devtools/build/lib/packages",
         "//src/main/java/com/google/devtools/build/lib/skyframe:precomputed_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
-        "//src/main/java/com/google/devtools/build/lib/util",
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//src/main/protobuf:build_java_proto",
-        "//src/test/java/com/google/devtools/build/lib/testutil",
-        "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
         "//third_party:guava",
-        "//third_party:guava-testlib",
-        "//third_party:jsr305",
         "//third_party:junit4",
         "//third_party:mockito",
         "//third_party:truth",
@@ -48,20 +38,3 @@ java_test(
         "//src/test/java/com/google/devtools/build/lib:test_runner",
     ],
 )
-
-test_suite(
-    name = "windows_tests",
-    tags = [
-        "-no_windows",
-        "-slow",
-    ],
-    visibility = ["//visibility:private"],
-)
-
-test_suite(
-    name = "all_windows_tests",
-    tests = [
-        ":windows_tests",
-    ],
-    visibility = ["//src/test/java/com/google/devtools/build/lib/skyframe:__pkg__"],
-)