|
1 |
| -load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test") |
| 1 | +load("@rules_java//java:defs.bzl", "java_library", "java_test") |
2 | 2 |
|
3 | 3 | package(
|
4 | 4 | default_visibility = [
|
@@ -52,6 +52,7 @@ filegroup(
|
52 | 52 | "//src/test/java/com/google/devtools/build/lib/testing/common:srcs",
|
53 | 53 | "//src/test/java/com/google/devtools/build/lib/testutil:srcs",
|
54 | 54 | "//src/test/java/com/google/devtools/build/lib/windows:srcs",
|
| 55 | + "//src/test/java/com/google/devtools/build/lib/worker:srcs", |
55 | 56 | ],
|
56 | 57 | visibility = ["//src:__pkg__"],
|
57 | 58 | )
|
@@ -557,93 +558,6 @@ java_test(
|
557 | 558 | ],
|
558 | 559 | )
|
559 | 560 |
|
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 |
| - |
647 | 561 | TEST_SUITES = [
|
648 | 562 | "ziputils",
|
649 | 563 | "rules",
|
|
0 commit comments