Skip to content

Commit 5894a85

Browse files
larsrc-googlecopybara-github
larsrc-google
authored and
copybara-github
committed
Create BUILD file in worker tests directory instead of running tests from the parent directory.
RELNOTES: None. PiperOrigin-RevId: 368261056
1 parent 3c29bc8 commit 5894a85

File tree

3 files changed

+121
-92
lines changed
  • src/test

3 files changed

+121
-92
lines changed

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

Lines changed: 2 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test")
1+
load("@rules_java//java:defs.bzl", "java_library", "java_test")
22

33
package(
44
default_visibility = [
@@ -52,6 +52,7 @@ filegroup(
5252
"//src/test/java/com/google/devtools/build/lib/testing/common:srcs",
5353
"//src/test/java/com/google/devtools/build/lib/testutil:srcs",
5454
"//src/test/java/com/google/devtools/build/lib/windows:srcs",
55+
"//src/test/java/com/google/devtools/build/lib/worker:srcs",
5556
],
5657
visibility = ["//src:__pkg__"],
5758
)
@@ -557,93 +558,6 @@ java_test(
557558
],
558559
)
559560

560-
java_test(
561-
name = "worker-tests",
562-
srcs =
563-
glob([
564-
"worker/*Test.java",
565-
]) + [
566-
"worker/TestUtils.java",
567-
],
568-
test_class = "com.google.devtools.build.lib.AllTests",
569-
deps = [
570-
":AllTests",
571-
"//src/main/java/com/google/devtools/build/lib/actions",
572-
"//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
573-
"//src/main/java/com/google/devtools/build/lib/clock",
574-
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
575-
"//src/main/java/com/google/devtools/build/lib/events",
576-
"//src/main/java/com/google/devtools/build/lib/exec:spawn_runner",
577-
"//src/main/java/com/google/devtools/build/lib/exec/local",
578-
"//src/main/java/com/google/devtools/build/lib/sandbox",
579-
"//src/main/java/com/google/devtools/build/lib/shell",
580-
"//src/main/java/com/google/devtools/build/lib/util",
581-
"//src/main/java/com/google/devtools/build/lib/util:os",
582-
"//src/main/java/com/google/devtools/build/lib/util:resource_converter",
583-
"//src/main/java/com/google/devtools/build/lib/vfs",
584-
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
585-
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
586-
"//src/main/java/com/google/devtools/build/lib/worker",
587-
"//src/main/java/com/google/devtools/common/options:options_internal",
588-
"//src/main/protobuf:worker_protocol_java_proto",
589-
"//src/test/java/com/google/devtools/build/lib/actions/util",
590-
"//src/test/java/com/google/devtools/build/lib/events:testutil",
591-
"//src/test/java/com/google/devtools/build/lib/testutil",
592-
"//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
593-
"//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
594-
"//src/test/java/com/google/devtools/build/lib/vfs/util",
595-
"//third_party:apache_commons_pool2_checked_in",
596-
"//third_party:gson",
597-
"//third_party:guava",
598-
"//third_party:guava-testlib",
599-
"//third_party:junit4",
600-
"//third_party:mockito",
601-
"//third_party:truth",
602-
"//third_party/protobuf:protobuf_java",
603-
"//third_party/protobuf:protobuf_java_util",
604-
],
605-
)
606-
607-
java_library(
608-
name = "ExampleWorker-lib",
609-
srcs = glob(["worker/*ExampleWorker*.java"]),
610-
visibility = [
611-
"//src/test/shell/integration:__pkg__",
612-
],
613-
deps = [
614-
"//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
615-
"//src/main/java/com/google/devtools/build/lib/worker:work_request_handlers",
616-
"//src/main/java/com/google/devtools/common/options",
617-
"//src/main/protobuf:worker_protocol_java_proto",
618-
"//third_party:gson",
619-
"//third_party:guava",
620-
"//third_party/protobuf:protobuf_java",
621-
"//third_party/protobuf:protobuf_java_util",
622-
],
623-
)
624-
625-
java_binary(
626-
name = "ExampleWorker",
627-
main_class = "com.google.devtools.build.lib.worker.ExampleWorker",
628-
visibility = [
629-
"//src/test/shell/integration:__pkg__",
630-
],
631-
runtime_deps = [
632-
":ExampleWorker-lib",
633-
],
634-
)
635-
636-
java_binary(
637-
name = "ExampleWorkerMultiplexer",
638-
main_class = "com.google.devtools.build.lib.worker.ExampleWorkerMultiplexer",
639-
visibility = [
640-
"//src/test/shell/integration:__pkg__",
641-
],
642-
runtime_deps = [
643-
":ExampleWorker-lib",
644-
],
645-
)
646-
647561
TEST_SUITES = [
648562
"ziputils",
649563
"rules",

‎src/test/java/com/google/devtools/build/lib/worker/BUILD‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test")
2+
3+
package(
4+
default_testonly = 1,
5+
default_visibility = ["//src:__subpackages__"],
6+
)
7+
8+
filegroup(
9+
name = "srcs",
10+
testonly = 0,
11+
srcs = glob(["*"]),
12+
visibility = ["//src:__subpackages__"],
13+
)
14+
15+
java_library(
16+
name = "ExampleWorker_lib",
17+
srcs = [
18+
"ExampleWorker.java",
19+
"ExampleWorkerMultiplexer.java",
20+
"ExampleWorkerMultiplexerOptions.java",
21+
"ExampleWorkerOptions.java",
22+
"ExampleWorkerProtocol.java",
23+
],
24+
deps = [
25+
"//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
26+
"//src/main/java/com/google/devtools/build/lib/worker:work_request_handlers",
27+
"//src/main/java/com/google/devtools/common/options",
28+
"//src/main/protobuf:worker_protocol_java_proto",
29+
"//third_party:gson",
30+
"//third_party:guava",
31+
],
32+
)
33+
34+
java_library(
35+
name = "testutil",
36+
testonly = 1,
37+
srcs = ["TestUtils.java"],
38+
deps = [
39+
"//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
40+
"//src/main/java/com/google/devtools/build/lib/shell",
41+
"//src/main/java/com/google/devtools/build/lib/vfs",
42+
"//src/main/java/com/google/devtools/build/lib/worker",
43+
"//third_party:guava",
44+
],
45+
)
46+
47+
java_binary(
48+
name = "ExampleWorker",
49+
main_class = "com.google.devtools.build.lib.worker.ExampleWorker",
50+
runtime_deps = [":ExampleWorker_lib"],
51+
)
52+
53+
java_binary(
54+
name = "ExampleWorkerMultiplexer",
55+
main_class = "com.google.devtools.build.lib.worker.ExampleWorkerMultiplexer",
56+
runtime_deps = [":ExampleWorker_lib"],
57+
)
58+
59+
java_library(
60+
name = "WorkerTests_lib",
61+
srcs = glob(["*Test.java"]),
62+
deps = [
63+
":testutil",
64+
"//src/main/java/com/google/devtools/build/lib/actions",
65+
"//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
66+
"//src/main/java/com/google/devtools/build/lib/clock",
67+
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
68+
"//src/main/java/com/google/devtools/build/lib/events",
69+
"//src/main/java/com/google/devtools/build/lib/exec:spawn_runner",
70+
"//src/main/java/com/google/devtools/build/lib/exec/local",
71+
"//src/main/java/com/google/devtools/build/lib/sandbox",
72+
"//src/main/java/com/google/devtools/build/lib/util:resource_converter",
73+
"//src/main/java/com/google/devtools/build/lib/vfs",
74+
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
75+
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
76+
"//src/main/java/com/google/devtools/build/lib/worker",
77+
"//src/main/java/com/google/devtools/common/options",
78+
"//src/main/protobuf:worker_protocol_java_proto",
79+
"//src/test/java/com/google/devtools/build/lib/actions/util",
80+
"//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
81+
"//src/test/java/com/google/devtools/build/lib/vfs/util",
82+
"//third_party:apache_commons_pool2",
83+
"//third_party:guava",
84+
"//third_party:guava-testlib",
85+
"//third_party:junit4",
86+
"//third_party:mockito",
87+
"//third_party:truth",
88+
"//third_party/protobuf:protobuf_java",
89+
],
90+
)
91+
92+
java_test(
93+
name = "WorkerTests",
94+
size = "small",
95+
data = [
96+
"//src/test/java/com/google/devtools/build/lib:embedded_scripts",
97+
],
98+
test_class = "com.google.devtools.build.lib.AllTests",
99+
runtime_deps = [
100+
":WorkerTests_lib",
101+
"//src/test/java/com/google/devtools/build/lib:test_runner",
102+
],
103+
)
104+
105+
java_test(
106+
name = "WorkRequestHandlerTest",
107+
srcs = ["WorkRequestHandlerTest.java"],
108+
deps = [
109+
"//src/main/java/com/google/devtools/build/lib/worker:work_request_handlers",
110+
"//src/main/protobuf:worker_protocol_java_proto",
111+
"//third_party:junit4",
112+
"//third_party:mockito",
113+
"//third_party:truth",
114+
],
115+
)

‎src/test/shell/integration/BUILD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ sh_test(
510510
],
511511
data = [
512512
":test-deps",
513-
"//src/test/java/com/google/devtools/build/lib:ExampleWorker_deploy.jar",
513+
"//src/test/java/com/google/devtools/build/lib/worker:ExampleWorker_deploy.jar",
514514
],
515515
shard_count = 3,
516516
tags = [
@@ -529,7 +529,7 @@ sh_test(
529529
],
530530
data = [
531531
":test-deps",
532-
"//src/test/java/com/google/devtools/build/lib:ExampleWorker_deploy.jar",
532+
"//src/test/java/com/google/devtools/build/lib/worker:ExampleWorker_deploy.jar",
533533
],
534534
tags = [
535535
"no_windows",
@@ -547,7 +547,7 @@ sh_test(
547547
],
548548
data = [
549549
":test-deps",
550-
"//src/test/java/com/google/devtools/build/lib:ExampleWorkerMultiplexer_deploy.jar",
550+
"//src/test/java/com/google/devtools/build/lib/worker:ExampleWorkerMultiplexer_deploy.jar",
551551
],
552552
shard_count = 3,
553553
tags = [
@@ -566,7 +566,7 @@ sh_test(
566566
],
567567
data = [
568568
":test-deps",
569-
"//src/test/java/com/google/devtools/build/lib:ExampleWorker_deploy.jar",
569+
"//src/test/java/com/google/devtools/build/lib/worker:ExampleWorker_deploy.jar",
570570
],
571571
# TODO(b/34450149): remove when no longer flaky
572572
flaky = 1,

0 commit comments

Comments
 (0)