diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build')
4 files changed, 4 insertions, 20 deletions
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()); |