diff options
Diffstat (limited to 'src')
17 files changed, 27 insertions, 111 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/apple/XCodeLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/apple/XCodeLocalEnvProvider.java index b0acfbf4b4..553fef0039 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/apple/XCodeLocalEnvProvider.java +++ b/src/main/java/com/google/devtools/build/lib/exec/apple/XCodeLocalEnvProvider.java @@ -47,6 +47,7 @@ public final class XCodeLocalEnvProvider implements LocalEnvProvider { private static final String XCRUN_CACHE_FILENAME = "__xcruncache"; private static final String XCODE_LOCATOR_CACHE_FILENAME = "__xcodelocatorcache"; + private final String productName; private final Map<String, String> clientEnv; /** @@ -54,13 +55,14 @@ public final class XCodeLocalEnvProvider implements LocalEnvProvider { * * @param clientEnv a map of the current Bazel command's environment */ - public XCodeLocalEnvProvider(Map<String, String> clientEnv) { + public XCodeLocalEnvProvider(String productName, Map<String, String> clientEnv) { + this.productName = productName; this.clientEnv = clientEnv; } @Override public Map<String, String> rewriteLocalEnv( - Map<String, String> env, Path execRoot, String fallbackTmpDir, String productName) + Map<String, String> env, Path execRoot, String fallbackTmpDir) throws IOException { boolean containsXcodeVersion = env.containsKey(AppleConfiguration.XCODE_VERSION_ENV_NAME); boolean containsAppleSdkVersion = diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/LocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/LocalEnvProvider.java index 40075652de..5af7a19ffc 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/local/LocalEnvProvider.java +++ b/src/main/java/com/google/devtools/build/lib/exec/local/LocalEnvProvider.java @@ -27,7 +27,7 @@ public interface LocalEnvProvider { new LocalEnvProvider() { @Override public Map<String, String> rewriteLocalEnv( - Map<String, String> env, Path execRoot, String fallbackTmpDir, String productName) { + Map<String, String> env, Path execRoot, String fallbackTmpDir) { return env; } }; @@ -41,9 +41,8 @@ public interface LocalEnvProvider { * particular implementation of {@link LocalEnvProvider} may choose to use some other path, * typically the "TMPDIR" environment variable in the Bazel client's environment, but if * that's unavailable, the implementation may decide to use this {@code fallbackTmpDir}. - * @param productName name of the Bazel binary, e.g. "bazel" */ Map<String, String> rewriteLocalEnv( - Map<String, String> env, Path execRoot, String fallbackTmpDir, String productName) + Map<String, String> env, Path execRoot, String fallbackTmpDir) throws IOException; } diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java index de2c06fea0..c695fd68d2 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java @@ -76,7 +76,6 @@ public class LocalSpawnRunner implements SpawnRunner { private final boolean useProcessWrapper; private final String processWrapper; - private final String productName; private final LocalEnvProvider localEnvProvider; // TODO(b/62588075): Move this logic to ProcessWrapperUtil? @@ -90,7 +89,6 @@ public class LocalSpawnRunner implements SpawnRunner { ResourceManager resourceManager, boolean useProcessWrapper, OS localOs, - String productName, LocalEnvProvider localEnvProvider) { this.execRoot = execRoot; this.processWrapper = getProcessWrapper(execRoot, localOs).getPathString(); @@ -98,7 +96,6 @@ public class LocalSpawnRunner implements SpawnRunner { this.hostName = NetUtil.getCachedShortHostName(); this.resourceManager = resourceManager; this.useProcessWrapper = useProcessWrapper; - this.productName = productName; this.localEnvProvider = localEnvProvider; } @@ -106,7 +103,6 @@ public class LocalSpawnRunner implements SpawnRunner { Path execRoot, LocalExecutionOptions localExecutionOptions, ResourceManager resourceManager, - String productName, LocalEnvProvider localEnvProvider) { this( execRoot, @@ -114,7 +110,6 @@ public class LocalSpawnRunner implements SpawnRunner { resourceManager, OS.getCurrent() != OS.WINDOWS && getProcessWrapper(execRoot, OS.getCurrent()).exists(), OS.getCurrent(), - productName, localEnvProvider); } @@ -255,6 +250,9 @@ public class LocalSpawnRunner implements SpawnRunner { OutputStream stdErr; Path commandTmpDir = tmpDir.getRelative("work"); commandTmpDir.createDirectory(); + Map<String, String> environment = + localEnvProvider.rewriteLocalEnv( + spawn.getEnvironment(), execRoot, commandTmpDir.getPathString()); if (useProcessWrapper) { // If the process wrapper is enabled, we use its timeout feature, which first interrupts // the subprocess and only kills it after a grace period so that the subprocess can output @@ -277,8 +275,7 @@ public class LocalSpawnRunner implements SpawnRunner { cmd = new Command( cmdLine.toArray(new String[0]), - localEnvProvider.rewriteLocalEnv( - spawn.getEnvironment(), execRoot, commandTmpDir.getPathString(), productName), + environment, execRoot.getPathFile()); } else { stdOut = outErr.getOutputStream(); @@ -286,8 +283,7 @@ public class LocalSpawnRunner implements SpawnRunner { cmd = new Command( spawn.getArguments().toArray(new String[0]), - localEnvProvider.rewriteLocalEnv( - spawn.getEnvironment(), execRoot, commandTmpDir.getPathString(), productName), + environment, execRoot.getPathFile(), policy.getTimeout()); } diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java index 1a30d3bb57..7a8bbe9fd7 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java +++ b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java @@ -41,7 +41,7 @@ public final class PosixLocalEnvProvider implements LocalEnvProvider { */ @Override public Map<String, String> rewriteLocalEnv( - Map<String, String> env, Path execRoot, String fallbackTmpDir, String productName) { + Map<String, String> env, Path execRoot, String fallbackTmpDir) { ImmutableMap.Builder<String, String> result = ImmutableMap.builder(); result.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR"))); String p = clientEnv.get("TMPDIR"); diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java index 91e218beac..96ce78e8f3 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java +++ b/src/main/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProvider.java @@ -48,7 +48,7 @@ public final class WindowsLocalEnvProvider implements LocalEnvProvider { */ @Override public Map<String, String> rewriteLocalEnv( - Map<String, String> env, Path execRoot, String fallbackTmpDir, String productName) { + Map<String, String> env, Path execRoot, String fallbackTmpDir) { ImmutableMap.Builder<String, String> result = ImmutableMap.builder(); result.putAll(Maps.filterKeys(env, k -> !k.equals("TMP") && !k.equals("TEMP"))); String p = clientEnv.get("TMP"); diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java index a3bcb4c14f..c761c10f3c 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java @@ -93,7 +93,7 @@ final class RemoteActionContextProvider extends ActionContextProvider { env.getOptions().getOptions(LocalExecutionOptions.class); LocalEnvProvider localEnvProvider = OS.getCurrent() == OS.DARWIN - ? new XCodeLocalEnvProvider(env.getClientEnv()) + ? new XCodeLocalEnvProvider(env.getRuntime().getProductName(), env.getClientEnv()) : (OS.getCurrent() == OS.WINDOWS ? new WindowsLocalEnvProvider(env.getClientEnv()) : new PosixLocalEnvProvider(env.getClientEnv())); @@ -102,7 +102,6 @@ final class RemoteActionContextProvider extends ActionContextProvider { env.getExecRoot(), localExecutionOptions, ResourceManager.instance(), - env.getRuntime().getProductName(), localEnvProvider); } diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java index ebd75bf48b..9d924e974d 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java @@ -150,7 +150,8 @@ final class DarwinSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { this.productName = productName; this.alwaysWritableDirs = getAlwaysWritableDirs(cmdEnv.getRuntime().getFileSystem()); this.processWrapper = ProcessWrapperUtil.getProcessWrapper(cmdEnv); - this.localEnvProvider = new XCodeLocalEnvProvider(cmdEnv.getClientEnv()); + this.localEnvProvider = + new XCodeLocalEnvProvider(cmdEnv.getRuntime().getProductName(), cmdEnv.getClientEnv()); this.timeoutKillDelay = timeoutKillDelay; } @@ -223,8 +224,7 @@ final class DarwinSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { Path tmpDir = sandboxExecRoot.getRelative("tmp"); Map<String, String> environment = - localEnvProvider.rewriteLocalEnv( - spawn.getEnvironment(), execRoot, tmpDir.getPathString(), productName); + localEnvProvider.rewriteLocalEnv(spawn.getEnvironment(), execRoot, tmpDir.getPathString()); final HashSet<Path> writableDirs = new HashSet<>(alwaysWritableDirs); ImmutableSet<Path> extraWritableDirs = getWritableDirs(sandboxExecRoot, environment); diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java index ad677f17ae..bd21c1b680 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java @@ -85,66 +85,12 @@ final class LinuxSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { private final Path inaccessibleHelperDir; private final LocalEnvProvider localEnvProvider; private final Optional<Duration> timeoutKillDelay; - private final String productName; - - /** - * Creates a sandboxed spawn runner that uses the {@code linux-sandbox} tool. If a spawn exceeds - * its timeout, then it will be killed instantly. - * - * @param cmdEnv the command environment to use - * @param sandboxBase path to the sandbox base directory - * @param productName the product name to use - * @param inaccessibleHelperFile path to a file that is (already) inaccessible - * @param inaccessibleHelperDir path to a directory that is (already) inaccessible - */ - LinuxSandboxedSpawnRunner( - CommandEnvironment cmdEnv, - Path sandboxBase, - String productName, - Path inaccessibleHelperFile, - Path inaccessibleHelperDir) { - this( - cmdEnv, - sandboxBase, - productName, - inaccessibleHelperFile, - inaccessibleHelperDir, - Optional.empty()); - } - - /** - * Creates a sandboxed spawn runner that uses the {@code linux-sandbox} tool. If a spawn exceeds - * its timeout, then it will be killed after the specified delay. - * - * @param cmdEnv the command environment to use - * @param sandboxBase path to the sandbox base directory - * @param productName the product name to use - * @param inaccessibleHelperFile path to a file that is (already) inaccessible - * @param inaccessibleHelperDir path to a directory that is (already) inaccessible - * @param timeoutKillDelay an additional grace period before killing timing out commands - */ - LinuxSandboxedSpawnRunner( - CommandEnvironment cmdEnv, - Path sandboxBase, - String productName, - Path inaccessibleHelperFile, - Path inaccessibleHelperDir, - Duration timeoutKillDelay) { - this( - cmdEnv, - sandboxBase, - productName, - inaccessibleHelperFile, - inaccessibleHelperDir, - Optional.of(timeoutKillDelay)); - } /** * Creates a sandboxed spawn runner that uses the {@code linux-sandbox} tool. * * @param cmdEnv the command environment to use * @param sandboxBase path to the sandbox base directory - * @param productName the product name to use * @param inaccessibleHelperFile path to a file that is (already) inaccessible * @param inaccessibleHelperDir path to a directory that is (already) inaccessible * @param timeoutKillDelay an optional, additional grace period before killing timing out @@ -153,7 +99,6 @@ final class LinuxSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { LinuxSandboxedSpawnRunner( CommandEnvironment cmdEnv, Path sandboxBase, - String productName, Path inaccessibleHelperFile, Path inaccessibleHelperDir, Optional<Duration> timeoutKillDelay) { @@ -161,7 +106,6 @@ final class LinuxSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { this.fileSystem = cmdEnv.getRuntime().getFileSystem(); this.blazeDirs = cmdEnv.getDirectories(); this.execRoot = cmdEnv.getExecRoot(); - this.productName = productName; this.allowNetwork = SandboxHelpers.shouldAllowNetwork(cmdEnv.getOptions()); this.linuxSandbox = LinuxSandboxUtil.getLinuxSandbox(cmdEnv); this.inaccessibleHelperFile = inaccessibleHelperFile; @@ -182,8 +126,7 @@ final class LinuxSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { Path tmpDir = sandboxExecRoot.getRelative("tmp"); Map<String, String> environment = - localEnvProvider.rewriteLocalEnv( - spawn.getEnvironment(), execRoot, tmpDir.getPathString(), productName); + localEnvProvider.rewriteLocalEnv(spawn.getEnvironment(), execRoot, tmpDir.getPathString()); Set<Path> writableDirs = getWritableDirs(sandboxExecRoot, environment); ImmutableSet<PathFragment> outputs = SandboxHelpers.getOutputFiles(spawn); diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java index 9e665db734..360fcbbce4 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java @@ -99,7 +99,6 @@ public final class LinuxSandboxedStrategy extends AbstractSpawnStrategy { return new LinuxSandboxedSpawnRunner( cmdEnv, sandboxBase, - productName, inaccessibleHelperFile, inaccessibleHelperDir, timeoutKillDelay); diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java index 18b33c2de4..60bd17adca 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java @@ -37,7 +37,6 @@ final class ProcessWrapperSandboxedSpawnRunner extends AbstractSandboxSpawnRunne } private final Path execRoot; - private final String productName; private final Path processWrapper; private final LocalEnvProvider localEnvProvider; private final Optional<Duration> timeoutKillDelay; @@ -85,12 +84,11 @@ final class ProcessWrapperSandboxedSpawnRunner extends AbstractSandboxSpawnRunne Optional<Duration> timeoutKillDelay) { super(cmdEnv, sandboxBase); this.execRoot = cmdEnv.getExecRoot(); - this.productName = productName; this.timeoutKillDelay = timeoutKillDelay; this.processWrapper = ProcessWrapperUtil.getProcessWrapper(cmdEnv); this.localEnvProvider = OS.getCurrent() == OS.DARWIN - ? new XCodeLocalEnvProvider(cmdEnv.getClientEnv()) + ? new XCodeLocalEnvProvider(productName, cmdEnv.getClientEnv()) : new PosixLocalEnvProvider(cmdEnv.getClientEnv()); } @@ -106,8 +104,7 @@ final class ProcessWrapperSandboxedSpawnRunner extends AbstractSandboxSpawnRunne Path tmpDir = sandboxExecRoot.getRelative("tmp"); Map<String, String> environment = - localEnvProvider.rewriteLocalEnv( - spawn.getEnvironment(), execRoot, tmpDir.getPathString(), productName); + localEnvProvider.rewriteLocalEnv(spawn.getEnvironment(), execRoot, tmpDir.getPathString()); Duration timeout = policy.getTimeout(); ProcessWrapperUtil.CommandLineBuilder commandLineBuilder = diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java index 24a08c4097..3e4af216e7 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java @@ -100,14 +100,13 @@ final class SandboxActionContextProvider extends ActionContextProvider { env.getOptions().getOptions(LocalExecutionOptions.class); LocalEnvProvider localEnvProvider = OS.getCurrent() == OS.DARWIN - ? new XCodeLocalEnvProvider(env.getClientEnv()) + ? new XCodeLocalEnvProvider(env.getRuntime().getProductName(), env.getClientEnv()) : new PosixLocalEnvProvider(env.getClientEnv()); return new LocalSpawnRunner( env.getExecRoot(), localExecutionOptions, ResourceManager.instance(), - env.getRuntime().getProductName(), localEnvProvider); } diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java index efdf7e52be..c3ee1883be 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java @@ -72,7 +72,7 @@ public class StandaloneActionContextProvider extends ActionContextProvider { env.getOptions().getOptions(LocalExecutionOptions.class); LocalEnvProvider localEnvProvider = OS.getCurrent() == OS.DARWIN - ? new XCodeLocalEnvProvider(env.getClientEnv()) + ? new XCodeLocalEnvProvider(env.getRuntime().getProductName(), env.getClientEnv()) : (OS.getCurrent() == OS.WINDOWS ? new WindowsLocalEnvProvider(env.getClientEnv()) : new PosixLocalEnvProvider(env.getClientEnv())); @@ -81,7 +81,6 @@ public class StandaloneActionContextProvider extends ActionContextProvider { env.getExecRoot(), localExecutionOptions, ResourceManager.instance(), - env.getRuntime().getProductName(), localEnvProvider); } } diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java index 9c1a8343bf..f0b2070382 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java @@ -59,7 +59,7 @@ final class WorkerActionContextProvider extends ActionContextProvider { env.getOptions().getOptions(LocalExecutionOptions.class); LocalEnvProvider localEnvProvider = OS.getCurrent() == OS.DARWIN - ? new XCodeLocalEnvProvider(env.getClientEnv()) + ? new XCodeLocalEnvProvider(env.getRuntime().getProductName(), env.getClientEnv()) : (OS.getCurrent() == OS.WINDOWS ? new WindowsLocalEnvProvider(env.getClientEnv()) : new PosixLocalEnvProvider(env.getClientEnv())); @@ -67,7 +67,6 @@ final class WorkerActionContextProvider extends ActionContextProvider { env.getExecRoot(), localExecutionOptions, ResourceManager.instance(), - env.getRuntime().getProductName(), localEnvProvider); } diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java index 54f098907d..11312c8b2a 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java @@ -92,7 +92,6 @@ public class LocalSpawnRunnerTest { ResourceManager resourceManager, boolean useProcessWrapper, OS localOs, - String productName, LocalEnvProvider localEnvProvider) { super( execRoot, @@ -100,7 +99,6 @@ public class LocalSpawnRunnerTest { resourceManager, useProcessWrapper, localOs, - productName, localEnvProvider); } @@ -310,7 +308,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); @@ -365,7 +362,6 @@ public class LocalSpawnRunnerTest { resourceManager, NO_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); @@ -410,7 +406,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); @@ -456,7 +451,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); assertThat(fs.getPath("/out").createDirectory()).isTrue(); @@ -492,7 +486,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); @@ -543,7 +536,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); @@ -575,7 +567,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); @@ -602,7 +593,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); @@ -633,7 +623,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", localEnvProvider); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); @@ -646,8 +635,7 @@ public class LocalSpawnRunnerTest { .rewriteLocalEnv( any(), eq(fs.getPath("/execroot")), - matches("^/execroot/tmp[0-9a-fA-F]+_[0-9a-fA-F]+/work$"), - eq("product-name")); + matches("^/execroot/tmp[0-9a-fA-F]+_[0-9a-fA-F]+/work$")); } @Test @@ -673,7 +661,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.WINDOWS, - "product-name", LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); @@ -798,7 +785,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); Spawn spawn = @@ -860,7 +846,6 @@ public class LocalSpawnRunnerTest { resourceManager, USE_WRAPPER, OS.LINUX, - "product-name", LocalEnvProvider.UNMODIFIED); Spawn spawn = diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProviderTest.java b/src/test/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProviderTest.java index 314d0f0191..f7f9ca5b87 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProviderTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProviderTest.java @@ -28,7 +28,7 @@ public final class PosixLocalEnvProviderTest { private static Map<String, String> rewriteEnv( PosixLocalEnvProvider p, ImmutableMap<String, String> env) { - return p.rewriteLocalEnv(env, null, null, null); + return p.rewriteLocalEnv(env, null, null); } /** Should use the client environment's TMPDIR envvar if specified. */ diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProviderTest.java b/src/test/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProviderTest.java index 08881b107e..646278ec9d 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProviderTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/local/WindowsLocalEnvProviderTest.java @@ -28,12 +28,12 @@ public final class WindowsLocalEnvProviderTest { private static Map<String, String> rewriteEnv( WindowsLocalEnvProvider p, ImmutableMap<String, String> env) { - return p.rewriteLocalEnv(env, null, null, null); + return p.rewriteLocalEnv(env, null, null); } private static Map<String, String> rewriteEnv( WindowsLocalEnvProvider p, ImmutableMap<String, String> env, String fallback) { - return p.rewriteLocalEnv(env, null, fallback, null); + return p.rewriteLocalEnv(env, null, fallback); } /** Should use the client environment's TMP envvar if specified. */ 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 bd5adbfb0b..d2502f8023 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 @@ -141,7 +141,6 @@ public class StandaloneSpawnStrategyTest { execRoot, localExecutionOptions, resourceManager, - "mock-product-name", LocalEnvProvider.UNMODIFIED))), ImmutableList.<ActionContextProvider>of()); |