diff options
| author | Oliver Nguyen <olivernguyen@google.com> | 2019-07-02 15:49:02 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 15:49:02 -0700 |
| commit | af9aadb8cd09d41455a4f36a75b88b0199e74cf7 (patch) | |
| tree | 0b953892442ee2241420b03c6b914c020c0b2585 | |
| parent | f445f4dc3cd65a6064260b2c79ca622bcd2ef875 (diff) | |
| parent | 371686516ba78caefce375bcfa46bb29c5f7796c (diff) | |
| download | tradefederation-af9aadb8cd09d41455a4f36a75b88b0199e74cf7.tar.gz | |
Merge "Merge --native-coverage flag with the --coverage flag." into qt-dev
am: 371686516b
Change-Id: Ie11a18ca015145d8f26203a4862158c2f3f026a4
| -rw-r--r-- | src/com/android/tradefed/testtype/GTestBase.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/tradefed/testtype/GTestBaseTest.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/tradefed/testtype/GTestBase.java b/src/com/android/tradefed/testtype/GTestBase.java index a218aed47..a03e907dc 100644 --- a/src/com/android/tradefed/testtype/GTestBase.java +++ b/src/com/android/tradefed/testtype/GTestBase.java @@ -90,7 +90,7 @@ public abstract class GTestBase private long mMaxTestTimeMs = 1 * 60 * 1000L; @Option( - name = "native-coverage", + name = "coverage", description = "Collect code coverage for this test run. Note that the build under test must be a " + "coverage build or else this will fail." diff --git a/tests/src/com/android/tradefed/testtype/GTestBaseTest.java b/tests/src/com/android/tradefed/testtype/GTestBaseTest.java index fa34c7191..27a816fa8 100644 --- a/tests/src/com/android/tradefed/testtype/GTestBaseTest.java +++ b/tests/src/com/android/tradefed/testtype/GTestBaseTest.java @@ -195,7 +195,7 @@ public class GTestBaseTest { public void testCoverage_addsCodeCoverageListener() throws ConfigurationException { GTestBase gTestBase = new GTestBaseImpl(); mSetter = new OptionSetter(gTestBase); - mSetter.setOptionValue("native-coverage", "true"); + mSetter.setOptionValue("coverage", "true"); ITestInvocationListener listener = gTestBase.addNativeCoverageListenerIfEnabled(mMockTestDevice, mMockListener); @@ -208,7 +208,7 @@ public class GTestBaseTest { public void testNoCoverage_doesNotAddCodeCoverageListener() throws ConfigurationException { GTestBase gTestBase = new GTestBaseImpl(); mSetter = new OptionSetter(gTestBase); - mSetter.setOptionValue("native-coverage", "false"); + mSetter.setOptionValue("coverage", "false"); ITestInvocationListener listener = gTestBase.addNativeCoverageListenerIfEnabled(mMockTestDevice, mMockListener); |