diff options
author | ulfjack <ulfjack@google.com> | 2017-04-18 15:02:10 +0200 |
---|---|---|
committer | Klaus Aehlig <aehlig@google.com> | 2017-04-18 15:26:31 +0200 |
commit | 0d3d5ae35650b23cb6c1a232342ec51dc88728c2 (patch) | |
tree | 601b6d4c34bb3f821d42f872206bd2b12eff4c1d /src/test/java/com/google | |
parent | 24eb353c93192131ba0787b896bf5027d339e253 (diff) |
Implement logging in LocalSpawnRunner
This is a prerequisite for Google to use it; there's no consistent logging
strategy yet, but Google internally requires logging, and it needs to be
somewhat backwards compatible.
PiperOrigin-RevId: 153454160
Diffstat (limited to 'src/test/java/com/google')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java | 31 |
1 files changed, 25 insertions, 6 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 97265c4438..23d6515c0a 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 @@ -47,6 +47,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.SortedMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Filter; +import java.util.logging.LogRecord; +import java.util.logging.Logger; import java.util.regex.Pattern; import org.junit.After; import org.junit.Before; @@ -130,6 +134,8 @@ public class LocalSpawnRunnerTest { private final ActionInputFileCache mockFileCache = mock(ActionInputFileCache.class); private final ResourceManager resourceManager = ResourceManager.instanceForTestingOnly(); + private Logger logger; + private AtomicInteger execCount = new AtomicInteger(); private FileOutErr outErr; private long timeoutMillis = 0; private boolean calledLockOutputFiles; @@ -174,6 +180,13 @@ public class LocalSpawnRunnerTest { @Before public final void setup() throws Exception { + logger = Logger.getAnonymousLogger(); + logger.setFilter(new Filter() { + @Override + public boolean isLoggable(LogRecord record) { + return false; + } + }); fs = new InMemoryFileSystem(); // Prevent any subprocess execution at all. SubprocessBuilder.setSubprocessFactory(new SubprocessInterceptor()); @@ -196,7 +209,8 @@ public class LocalSpawnRunnerTest { LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class); options.localSigkillGraceSeconds = 456; LocalSpawnRunner runner = new LocalSpawnRunner( - fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, resourceManager, USE_WRAPPER); + logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, + resourceManager, USE_WRAPPER); timeoutMillis = 123 * 1000L; outErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); @@ -228,7 +242,8 @@ public class LocalSpawnRunnerTest { LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class); options.localSigkillGraceSeconds = 456; LocalSpawnRunner runner = new LocalSpawnRunner( - fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, resourceManager, NO_WRAPPER); + logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, + resourceManager, NO_WRAPPER); timeoutMillis = 123 * 1000L; outErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); @@ -257,7 +272,8 @@ public class LocalSpawnRunnerTest { LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class); LocalSpawnRunner runner = new LocalSpawnRunner( - fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, resourceManager, USE_WRAPPER); + logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, + resourceManager, USE_WRAPPER); outErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); SpawnResult result = runner.exec(SIMPLE_SPAWN, policy); @@ -286,7 +302,8 @@ public class LocalSpawnRunnerTest { LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class); LocalSpawnRunner runner = new LocalSpawnRunner( - fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, resourceManager, USE_WRAPPER); + logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, + resourceManager, USE_WRAPPER); outErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); SpawnResult result = runner.exec(SIMPLE_SPAWN, policy); @@ -305,7 +322,8 @@ public class LocalSpawnRunnerTest { LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class); options.allowedLocalAction = Pattern.compile("none"); LocalSpawnRunner runner = new LocalSpawnRunner( - fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, resourceManager, USE_WRAPPER); + logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, + resourceManager, USE_WRAPPER); outErr = new FileOutErr(); SpawnResult reply = runner.exec(SIMPLE_SPAWN, policy); @@ -343,7 +361,8 @@ public class LocalSpawnRunnerTest { LocalExecutionOptions options = Options.getDefaults(LocalExecutionOptions.class); LocalSpawnRunner runner = new LocalSpawnRunner( - fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, resourceManager, USE_WRAPPER); + logger, execCount, fs.getPath("/execroot"), ActionInputPrefetcher.NONE, options, + resourceManager, USE_WRAPPER); outErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); try { |