commit 1b2b63269a9d739956371ff719f9f4796646ab4a
author Julien Desprez <jdesprez@google.com> Thu Aug 30 10:10:27 2018 -0700
committer Julien Desprez <jdesprez@google.com> Thu Aug 30 10:10:27 2018 -0700
tree e376a09bce11ec0db7aabb83399d115a619e3b26
parent ddf2d20b62e43fe70a3e3b46672a8e7ae26cc325

Skip reboot in GTest is isCollectOnly true

If we are simply collecting tests, skip reboots.

Test: unit tests
Bug: 112285471
Change-Id: Ia7d3df1b854bb1617535ac91051988b8e2fd712e

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

diff --git a/src/com/android/tradefed/testtype/GTest.java b/src/com/android/tradefed/testtype/GTest.java
index 33090ae..4c69085 100644
--- a/src/com/android/tradefed/testtype/GTest.java
+++ b/src/com/android/tradefed/testtype/GTest.java
@@ -226,7 +226,7 @@
                 testDevice.executeShellCommand(cmd);
             }
 
-            if (mRebootBeforeTest) {
+            if (mRebootBeforeTest && !isCollectTestsOnly()) {
                 CLog.d("Rebooting device before test starts as requested.");
                 testDevice.reboot();
             }