Make lib/shell test targets more consistent.

RELNOTES: None.
PiperOrigin-RevId: 180826643

4 files changed, 102 insertions, 42 deletions

diff --git a/src/BUILD b/src/BUILD
index 3bb7be74cd..9fbbc4785f 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -361,6 +361,7 @@ filegroup(
         "//src/test/java/com/google/devtools/build/android:srcs",
         "//src/test/java/com/google/devtools/build/docgen:srcs",
         "//src/test/java/com/google/devtools/build/lib:srcs",
+        "//src/test/java/com/google/devtools/build/lib/shell:srcs",
         "//src/test/java/com/google/devtools/build/skyframe:srcs",
         "//src/test/java/com/google/devtools/common/options:srcs",
         "//src/test/py/bazel:srcs",
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 08e4f862db..b4d108be0c 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -729,48 +729,6 @@ java_test(
     ],
 )
 
-cc_binary(
-    name = "shell/killmyself",
-    srcs = ["shell/killmyself.cc"],
-)
-
-java_test(
-    name = "shell_test",
-    srcs = glob([
-        "shell/*.java",
-    ]),
-    data = [
-        ":shell/killmyself",
-        "//src/main/tools:process-wrapper",
-        "//src/test/shell/integration:spend_cpu_time",
-    ],
-    flaky = True,
-    tags = [
-        "no_windows",
-        "shell",
-    ],
-    test_class = "com.google.devtools.build.lib.AllTests",
-    deps = [
-        ":foundations_testutil",
-        ":test_runner",
-        ":testutil",
-        "//src/main/java/com/google/devtools/build/lib:bazel-main",
-        "//src/main/java/com/google/devtools/build/lib:os_util",
-        "//src/main/java/com/google/devtools/build/lib:runtime",
-        "//src/main/java/com/google/devtools/build/lib:util",
-        "//src/main/java/com/google/devtools/build/lib/collect",
-        "//src/main/java/com/google/devtools/build/lib/shell",
-        "//src/main/protobuf:execution_statistics_java_proto",
-        "//third_party:guava",
-        "//third_party:guava-testlib",
-        "//third_party:jsr305",
-        "//third_party:junit4",
-        "//third_party:mockito",
-        "//third_party:truth",
-        "//third_party:truth8",
-    ],
-)
-
 java_test(
     name = "server_test",
     srcs = glob([
diff --git a/src/test/java/com/google/devtools/build/lib/shell/BUILD b/src/test/java/com/google/devtools/build/lib/shell/BUILD
new file mode 100644
index 0000000000..babbb6e927
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/shell/BUILD
@@ -0,0 +1,95 @@
+package(
+    default_testonly = 1,
+    default_visibility = [
+        "//src/test/java/com/google/devtools/build/lib:__subpackages__",
+    ],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "srcs",
+    testonly = 0,
+    srcs = glob(
+        ["**"],
+        exclude = [
+            "*~",
+        ],
+    ),
+    visibility = ["//src:__pkg__"],
+)
+
+java_library(
+    name = "ShellTests_lib",
+    srcs = glob(
+        ["*.java"],
+        exclude = [
+            "InterruptibleTest.java",
+        ],
+    ),
+    javacopts = ["-Xlint:-deprecation"],
+    deps = [
+        "//src/main/java/com/google/devtools/build/lib:bazel-main",
+        "//src/main/java/com/google/devtools/build/lib:os_util",
+        "//src/main/java/com/google/devtools/build/lib:runtime",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib/collect",
+        "//src/main/java/com/google/devtools/build/lib/shell",
+        "//src/main/protobuf:execution_statistics_java_proto",
+        "//src/test/java/com/google/devtools/build/lib:foundations_testutil",
+        "//src/test/java/com/google/devtools/build/lib:test_runner",
+        "//src/test/java/com/google/devtools/build/lib:testutil",
+        "//third_party:guava",
+        "//third_party:guava-testlib",
+        "//third_party:jsr305",
+        "//third_party:junit4",
+        "//third_party:mockito",
+        "//third_party:truth",
+        "//third_party:truth8",
+    ],
+)
+
+java_test(
+    name = "ShellTests",
+    size = "medium",
+    data = [
+        ":killmyself",
+        "//src/main/tools:linux-sandbox",
+        "//src/main/tools:process-wrapper",
+        "//src/test/shell/integration:spend_cpu_time",
+    ],
+    flaky = 1,
+    shard_count = 4,
+    tags = [
+        "no_windows",
+        "shell",
+    ],
+    test_class = "com.google.devtools.build.lib.AllTests",
+    runtime_deps = [
+        ":ShellTests_lib",
+        "//src/test/java/com/google/devtools/build/lib:test_runner",
+    ],
+)
+
+java_test(
+    name = "InterruptibleTest",
+    size = "small",
+    srcs = ["InterruptibleTest.java"],
+    flaky = 1,
+    tags = [
+        "no_windows",
+        "shell",
+    ],
+    deps = [
+        "//src/main/java/com/google/devtools/build/lib:os_util",
+        "//src/main/java/com/google/devtools/build/lib/shell",
+        "//third_party:junit4",
+        "//third_party:truth",
+        "//third_party:truth8",
+    ],
+)
+
+cc_binary(
+    name = "killmyself",
+    srcs = ["killmyself.cc"],
+)
diff --git a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java
index 20d70d8f17..6c183c91a7 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java
@@ -16,7 +16,9 @@ package com.google.devtools.build.lib.shell;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
+import com.google.devtools.build.lib.util.OS;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -78,6 +80,8 @@ public class InterruptibleTest {
    */
   @Test
   public void testUninterruptibleCommandRunsToCompletion() throws Exception {
+    assumeTrue(OS.getCurrent() != OS.WINDOWS);
+
     CommandResult result =
         command.executeAsync(Command.NO_INPUT, Command.CONTINUE_SUBPROCESS_ON_INTERRUPT).get();
     assertThat(result.getTerminationStatus().success()).isTrue();
@@ -99,6 +103,8 @@ public class InterruptibleTest {
    */
   @Test
   public void testInterruptibleCommandRunsToCompletion() throws Exception {
+    assumeTrue(OS.getCurrent() != OS.WINDOWS);
+
     try {
       command.execute();
       fail();