Add checks and comments

bazelbuild · Dec 14, 2020 · 4c97d40 · 4c97d40
1 parent 73839a8
commit 4c97d40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/scripts/ij.bazelproject b/scripts/ij.bazelproject
@@ -17,6 +17,6 @@ targets:
   //src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner
   //src/java_tools/junitrunner/javatests/...
   //src/java_tools/singlejar:SingleJar
-  //src/test/...
+  # //src/test/...
   //src/tools/remote/...
   //src/tools/starlark/...
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
@@ -401,7 +401,12 @@ private static Spawn createXmlGeneratingSpawn(
             Long.toString(result.getWallTime().orElse(Duration.ZERO).getSeconds()),
             Integer.toString(result.exitCode()));
     ImmutableMap.Builder<String, String> envBuilder = ImmutableMap.builder();
+    // "PATH" and "TEST_BINARY" are also required, they should always be set in testEnv.
+    Preconditions.checkArgument(testEnv.containsKey("PATH"));
+    Preconditions.checkArgument(testEnv.containsKey("TEST_BINARY"));
     envBuilder.putAll(testEnv).put("TEST_NAME", action.getTestName());
+    // testEnv only contains TEST_SHARD_INDEX and TEST_TOTAL_SHARDS if the test action is sharded,
+    // we need to set the default value when the action isn't sharded.
     if (!action.isSharded()) {
       envBuilder.put("TEST_SHARD_INDEX", "0");
       envBuilder.put("TEST_TOTAL_SHARDS", "0");