commit 3d8e51c437804116afb61eea1136bc68eb525528
author ulfjack <ulfjack@google.com> Thu Nov 29 06:54:29 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Thu Nov 29 06:55:54 2018 -0800
tree ee083582cf81454ca8774b91042bfc74eb9e0eb7
parent a0f79b172e1d79613c4136960a9db28df114697e

Set TEST_BINARY env variable for the xml generator

Otherwise the test name is not generated correctly. This is caught by
our existing integration tests, and I'm adding an assertion to our unit
tests as well.

Progress on #4608.

PiperOrigin-RevId: 223338264

src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java
index 365a0ec..e643331 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java
@@ -44,6 +44,7 @@
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.events.StoredEventHandler;
 import com.google.devtools.build.lib.exec.TestStrategy.TestOutputFormat;
+import com.google.devtools.build.lib.util.OS;
 import com.google.devtools.build.lib.util.io.FileOutErr;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
@@ -541,6 +542,11 @@
                     /*forciblyRunRemotely=*/ false,
                     /*catastrophe=*/ false);
               } else {
+                String testName =
+                    OS.getCurrent() == OS.WINDOWS
+                        ? "standalone/failing_test.exe"
+                        : "standalone/failing_test";
+                assertThat(spawn.getEnvironment()).containsEntry("TEST_BINARY", testName);
                 return ImmutableList.of(xmlGeneratorSpawnResult);
               }
             });