commit f7d795a3846645bc7d73c30587fe2acc0494a112
author Fabian Meumertzheim <fabian@meumertzhe.im> Mon May 08 03:43:30 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Mon May 08 03:44:45 2023 -0700
tree 5f638d5957e9bb26b170530aaee13e89f68993d4
parent 4e414d7ace77e8e2b5fbc3b1ab8c5eafb175772b

Actually check `TEST_SHARD_STATUS_FILE` has been touched

Adds the missing check that a test runner running a sharded test actually declares support for sharding by generating the `TEST_SHARD_STATUS_FILE`. Previously, if it didn't, each shard would silently run all tests. This new behavior is guarded by the new `--incompatible_check_sharding_support` flag.

Closes #18236.

PiperOrigin-RevId: 530259354
Change-Id: If3b01b2c796e66ad7a77e542145efe3ab412eae9

src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java

diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
index 2afb45f..30bd217 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
@@ -684,6 +684,25 @@
     }
     long endTimeMillis = actionExecutionContext.getClock().currentTimeMillis();
 
+    if (testAction.isSharded()) {
+      if (testAction.checkShardingSupport()
+          && !actionExecutionContext
+              .getPathResolver()
+              .convertPath(resolvedPaths.getTestShard())
+              .exists()) {
+        TestExecException e =
+            createTestExecException(
+                TestAction.Code.LOCAL_TEST_PREREQ_UNMET,
+                "Sharding requested, but the test runner did not advertise support for it by "
+                    + "touching TEST_SHARD_STATUS_FILE. Either remove the 'shard_count' attribute, "
+                    + "use a test runner that supports sharding or temporarily disable this check "
+                    + "via --noincompatible_check_sharding_support.");
+        closeSuppressed(e, streamed);
+        closeSuppressed(e, fileOutErr);
+        throw e;
+      }
+    }
+
     // SpawnActionContext guarantees the first entry to correspond to the spawn passed in (there
     // may be additional entries due to tree artifact handling).
     SpawnResult primaryResult = spawnResults.get(0);