Replace the occurrences of Constants.PRODUCT_NAME for a call to

BlazeRuntime#getProductName() or a reference to TestConstants.PRODUCT_NAME for tests.

This CL prepares the codebase in order to delete the constant.

--
MOS_MIGRATED_REVID=122993568

1 files changed, 5 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
index 6e4bfd24ed..733c4adf5f 100644
--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -89,7 +89,8 @@ public class StandaloneSpawnStrategyTest {
     Path outputBase = testRoot.getRelative("outputBase");
     outputBase.createDirectory();
 
-    BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, workspaceDir);
+    BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, workspaceDir,
+        TestConstants.PRODUCT_NAME);
     BlazeTestUtils.getIntegrationBinTools(directories);
     OptionsParser optionsParser = OptionsParser.newOptionsParser(ExecutionOptions.class);
     optionsParser.parse("--verbose_failures");
@@ -106,7 +107,8 @@ public class StandaloneSpawnStrategyTest {
         /* showSubcommands */ false,
         ImmutableList.<ActionContext>of(),
         ImmutableMap.<String, SpawnActionContext>of("",
-            new StandaloneSpawnStrategy(directories.getExecRoot(), false)),
+            new StandaloneSpawnStrategy(directories.getExecRoot(), false,
+                TestConstants.PRODUCT_NAME)),
         ImmutableList.<ActionContextProvider>of());
 
     executor.getExecRoot().createDirectory();
@@ -199,7 +201,7 @@ public class StandaloneSpawnStrategyTest {
     assertThat(out()).isEmpty();
   }
 
-  // Test an action with environment variables set indicating an action running on a darwin host 
+  // Test an action with environment variables set indicating an action running on a darwin host
   // system. Such actions should fail given the fact that these tests run on a non darwin
   // architecture.
   @Test