Change --no-collect-device-info to --skip-device-info/-d.
Change-Id: Ie2406d972e634fa028538d4804f1747060926e1b
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
index 4db3e48..aab164c 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
@@ -102,11 +102,11 @@
importance = Importance.IF_UNSET)
private Integer mContinueSessionId = null;
- @Option(name = "collect-device-info", description =
- "flag to control whether to collect info from device. Turning this off will speed up test" +
- "execution for short test runs but will result in required data being omitted from the " +
- "test report.")
- private boolean mCollectDeviceInfo = true;
+ @Option(name = "skip-device-info", shortName = 'd', description =
+ "flag to control whether to collect info from device. Providing this flag will speed up " +
+ "test execution for short test runs but will result in required data being omitted from " +
+ "the test report.")
+ private boolean mSkipDeviceInfo = false;
@Option(name = "resume", description =
"flag to attempt to automatically resume aborted test run on another connected device. ")
@@ -185,12 +185,12 @@
}
/**
- * Set the collect device info flag.
+ * Set the skip collect device info flag.
* <p/>
* Exposed for unit testing
*/
- void setCollectDeviceInfo(boolean collectDeviceInfo) {
- mCollectDeviceInfo = collectDeviceInfo;
+ void setSkipDeviceInfo(boolean skipDeviceInfo) {
+ mSkipDeviceInfo = skipDeviceInfo;
}
/**
@@ -546,7 +546,7 @@
*/
void collectDeviceInfo(ITestDevice device, CtsBuildHelper ctsBuild,
ITestInvocationListener listener) throws DeviceNotAvailableException {
- if (mCollectDeviceInfo) {
+ if (!mSkipDeviceInfo) {
DeviceInfoCollector.collectDeviceInfo(device, ctsBuild.getTestCasesDir(), listener);
}
}
diff --git a/tools/tradefed-host/tests/src/com/android/cts/tradefed/testtype/CtsTestTest.java b/tools/tradefed-host/tests/src/com/android/cts/tradefed/testtype/CtsTestTest.java
index 02311b0..f0fd536 100644
--- a/tools/tradefed-host/tests/src/com/android/cts/tradefed/testtype/CtsTestTest.java
+++ b/tools/tradefed-host/tests/src/com/android/cts/tradefed/testtype/CtsTestTest.java
@@ -92,11 +92,9 @@
mCtsTest.setDevice(mMockDevice);
mCtsTest.setBuildHelper(mStubBuildHelper);
// turn off device collection for simplicity
- mCtsTest.setCollectDeviceInfo(false);
+ mCtsTest.setSkipDeviceInfo(true);
EasyMock.expect(mMockPackageDef.getTargetApkName()).andStubReturn(null);
EasyMock.expect(mMockPackageDef.getTargetPackageName()).andStubReturn(null);
-
-
}
/**