Merge "Clear couple of sandbox logs that are not useful"
diff --git a/src/com/android/tradefed/result/proto/ProtoResultParser.java b/src/com/android/tradefed/result/proto/ProtoResultParser.java
index 3363053..8f5ecd6 100644
--- a/src/com/android/tradefed/result/proto/ProtoResultParser.java
+++ b/src/com/android/tradefed/result/proto/ProtoResultParser.java
@@ -251,7 +251,6 @@
if (!anyDescription.is(Context.class)) {
throw new RuntimeException("Expected Any description of type Context");
}
- log("Test module started proto");
try {
IInvocationContext moduleContext =
InvocationContext.fromProto(anyDescription.unpack(Context.class));
diff --git a/src/com/android/tradefed/sandbox/SandboxConfigUtil.java b/src/com/android/tradefed/sandbox/SandboxConfigUtil.java
index 3caa7b1..34d3e30 100644
--- a/src/com/android/tradefed/sandbox/SandboxConfigUtil.java
+++ b/src/com/android/tradefed/sandbox/SandboxConfigUtil.java
@@ -87,7 +87,9 @@
}
CommandResult result = runUtil.runTimedCmd(DUMP_TIMEOUT, mCmdArgs.toArray(new String[0]));
CLog.d("stdout: %s", result.getStdout());
- CLog.d("stderr: %s", result.getStderr());
+ if (result.getStderr() != null && !result.getStderr().isEmpty()) {
+ CLog.d("stderr: %s", result.getStderr());
+ }
if (CommandStatus.SUCCESS.equals(result.getStatus())) {
return destination;
}
diff --git a/src/com/android/tradefed/sandbox/TradefedSandbox.java b/src/com/android/tradefed/sandbox/TradefedSandbox.java
index dfa544c..92fe045 100644
--- a/src/com/android/tradefed/sandbox/TradefedSandbox.java
+++ b/src/com/android/tradefed/sandbox/TradefedSandbox.java
@@ -297,7 +297,8 @@
mEventParser = new SubprocessTestResultsParser(listener, true, context);
commandLine = commandLine + " --no-" + SandboxOptions.USE_PROTO_REPORTER;
}
- String[] args = QuotationAwareTokenizer.tokenizeLine(commandLine);
+ String[] args =
+ QuotationAwareTokenizer.tokenizeLine(commandLine, /* No Logging */ false);
mGlobalConfig = dumpGlobalConfig(config, new HashSet<>());
try (InputStreamSource source = new FileInputStreamSource(mGlobalConfig)) {
listener.testLog("sandbox-global-config", LogDataType.XML, source);