commit 15307af1720c325ecda0c3af89c7eebd2d0e3bbe
author jdesprez <jdesprez@google.com> Wed Apr 26 10:47:06 2017 -0700
committer Julien Desprez <jdesprez@google.com> Thu Apr 27 18:26:34 2017 +0000
tree e5ebaa12b7c00936e42e37c3e32c3d7fb4db3e3a
parent 11e84d80f60369374bbfce7a8921b4827050b289

Move output-test-log directly to xml config

To avoid launcher to inject option that does not exist
for the version of the child process. We move the option
to the xml config directly to be always in sync with the
branch.

Test: local run
Bug: 37706926
Change-Id: I54659ce6efe5b02628cd337703ddf88233946df4
(cherry picked from commit 80a5dae53ac6465db5cb8a84ddf0d190b3e68b5b)

src/com/android/tradefed/testtype/SubprocessTfLauncher.java

diff --git a/src/com/android/tradefed/testtype/SubprocessTfLauncher.java b/src/com/android/tradefed/testtype/SubprocessTfLauncher.java
index 4e68c28..9a65b4b 100644
--- a/src/com/android/tradefed/testtype/SubprocessTfLauncher.java
+++ b/src/com/android/tradefed/testtype/SubprocessTfLauncher.java
@@ -197,7 +197,6 @@
                 mCmdArgs.add("--subprocess-report-file");
                 mCmdArgs.add(eventFile.getAbsolutePath());
             }
-            mCmdArgs.add("--output-test-log");
 
             CommandResult result = mRunUtil.runTimedCmd(mMaxTfRunTime, stdout,
                     stderr, mCmdArgs.toArray(new String[0]));

tests/src/com/android/tradefed/testtype/TfTestLauncherTest.java

diff --git a/tests/src/com/android/tradefed/testtype/TfTestLauncherTest.java b/tests/src/com/android/tradefed/testtype/TfTestLauncherTest.java
index 1241033..daa755a 100644
--- a/tests/src/com/android/tradefed/testtype/TfTestLauncherTest.java
+++ b/tests/src/com/android/tradefed/testtype/TfTestLauncherTest.java
@@ -98,8 +98,7 @@
                                 EasyMock.eq("--build-flavor"),
                                 EasyMock.eq(BUILD_FLAVOR),
                                 EasyMock.eq("--subprocess-report-file"),
-                                (String) EasyMock.anyObject(),
-                                EasyMock.eq("--output-test-log")))
+                                (String) EasyMock.anyObject()))
                 .andReturn(cr);
 
         mMockRunUtil.unsetEnvVariable(SubprocessTfLauncher.TF_GLOBAL_CONFIG);

tests/src/com/android/tradefed/testtype/VersionedTfLauncherTest.java

diff --git a/tests/src/com/android/tradefed/testtype/VersionedTfLauncherTest.java b/tests/src/com/android/tradefed/testtype/VersionedTfLauncherTest.java
index a6ad8fe..5a647f7 100644
--- a/tests/src/com/android/tradefed/testtype/VersionedTfLauncherTest.java
+++ b/tests/src/com/android/tradefed/testtype/VersionedTfLauncherTest.java
@@ -111,8 +111,7 @@
                                 EasyMock.eq("--serial"),
                                 EasyMock.eq(FAKE_SERIAL),
                                 EasyMock.eq("--subprocess-report-file"),
-                                (String) EasyMock.anyObject(),
-                                EasyMock.eq("--output-test-log")))
+                                (String) EasyMock.anyObject()))
                 .andReturn(cr);
         Map<ITestDevice, IBuildInfo> deviceInfos = new HashMap<ITestDevice, IBuildInfo>();
         deviceInfos.put(mMockTestDevice, null);
@@ -162,8 +161,7 @@
                                 EasyMock.eq(TF_COMMAND_LINE_OPTION_VALUE),
                                 EasyMock.eq("--null-device"),
                                 EasyMock.eq("--subprocess-report-file"),
-                                (String) EasyMock.anyObject(),
-                                EasyMock.eq("--output-test-log")))
+                                (String) EasyMock.anyObject()))
                 .andReturn(cr);
         Map<ITestDevice, IBuildInfo> deviceInfos = new HashMap<ITestDevice, IBuildInfo>();
         deviceInfos.put(mMockTestDevice, null);
@@ -227,8 +225,7 @@
                                 EasyMock.eq("--shard-index"),
                                 EasyMock.eq("1"),
                                 EasyMock.eq("--subprocess-report-file"),
-                                (String) EasyMock.anyObject(),
-                                EasyMock.eq("--output-test-log")))
+                                (String) EasyMock.anyObject()))
                 .andReturn(cr);
         Map<ITestDevice, IBuildInfo> deviceInfos = new HashMap<ITestDevice, IBuildInfo>();
         deviceInfos.put(mMockTestDevice, null);