diff options
| author |  ulfjack <ulfjack@google.com> | 2018-05-15 00:31:32 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-15 00:33:09 -0700 |
| commit | 27487c77387e457df18be3b6833697096d074eab (patch) | |
| tree | 0a789b99b8afb6572edfd4b8dd0274e394cfc91d /src/test/java | |
| parent | 150a9065620cc66c19ccc8c663d4fb41bb82a1ca (diff) | |
Slightly refactor SpawnAction to improve env handling
This is in preparation for fixing env handling as well as cache key (to use
env) computations in subclasses of SpawnAction.
PiperOrigin-RevId: 196626495
Diffstat (limited to 'src/test/java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java index 3e0d629285..25c7e0d444 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java @@ -34,6 +34,7 @@ import com.google.devtools.build.lib.exec.BinTools; import com.google.devtools.build.lib.exec.util.TestExecutorBuilder; import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.PathFragment; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; import org.junit.Before; @@ -157,7 +158,8 @@ public class LtoBackendActionTest extends BuildViewTestCase { MNEMONIC, RUNFILES_SUPPLIER, INPUT, - ENVIRONMENT + FIXED_ENVIRONMENT, + VARIABLE_ENVIRONMENT } @Test @@ -204,10 +206,13 @@ public class LtoBackendActionTest extends BuildViewTestCase { } Map<String, String> env = new HashMap<>(); - if (attributesToFlip.contains(KeyAttributes.ENVIRONMENT)) { + if (attributesToFlip.contains(KeyAttributes.FIXED_ENVIRONMENT)) { env.put("foo", "bar"); } builder.setEnvironment(env); + if (attributesToFlip.contains(KeyAttributes.VARIABLE_ENVIRONMENT)) { + builder.setInheritedEnvironment(Arrays.asList("baz")); + } Action[] actions = builder.build( |