aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Nguyen <olivernguyen@google.com>2019-04-04 14:28:19 -0700
committerOliver Nguyen <olivernguyen@google.com>2019-04-04 14:28:19 -0700
commit28368eacf7907b506b46b966a3b02cbdb6d9926d (patch)
tree54a75022fc5ab58137e4e7829094f49bba57928c
parentea5aaf32f735e6bb87844b0e0819c75e82a8c493 (diff)
downloadtradefederation-28368eacf7907b506b46b966a3b02cbdb6d9926d.tar.gz
Update location of gcov coverage files.
Test: Unit tests Bug: 128524141 Change-Id: I62bd68fd2dda769356512ff96449868d8deaab23
-rw-r--r--src/com/android/tradefed/testtype/NativeCodeCoverageListener.java2
-rw-r--r--tests/src/com/android/tradefed/testtype/NativeCodeCoverageListenerTest.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/tradefed/testtype/NativeCodeCoverageListener.java b/src/com/android/tradefed/testtype/NativeCodeCoverageListener.java
index 54129e8b7..8d54a5157 100644
--- a/src/com/android/tradefed/testtype/NativeCodeCoverageListener.java
+++ b/src/com/android/tradefed/testtype/NativeCodeCoverageListener.java
@@ -42,7 +42,7 @@ import java.util.HashMap;
*/
final class NativeCodeCoverageListener extends ResultForwarder {
- private static final String NATIVE_COVERAGE_DEVICE_PATH = "/data/misc/gcov";
+ private static final String NATIVE_COVERAGE_DEVICE_PATH = "/data/misc/trace";
private static final String COVERAGE_FILE_LIST_COMMAND =
String.format("find %s -name '*.gcda'", NATIVE_COVERAGE_DEVICE_PATH);
diff --git a/tests/src/com/android/tradefed/testtype/NativeCodeCoverageListenerTest.java b/tests/src/com/android/tradefed/testtype/NativeCodeCoverageListenerTest.java
index c5006596c..dd65aca90 100644
--- a/tests/src/com/android/tradefed/testtype/NativeCodeCoverageListenerTest.java
+++ b/tests/src/com/android/tradefed/testtype/NativeCodeCoverageListenerTest.java
@@ -92,8 +92,8 @@ public class NativeCodeCoverageListenerTest {
// Setup mocks to write the coverage measurement to the file.
doReturn(
new StringJoiner("\n")
- .add("/data/misc/gcov/path/to/coverage.gcda")
- .add("/data/misc/gcov/path/to/.hidden/coverage2.gcda")
+ .add("/data/misc/trace/path/to/coverage.gcda")
+ .add("/data/misc/trace/path/to/.hidden/coverage2.gcda")
.toString())
.when(mMockDevice)
.executeShellCommand(anyString());
@@ -137,7 +137,7 @@ public class NativeCodeCoverageListenerTest {
@Test
public void testFailure_unableToPullFile() throws DeviceNotAvailableException {
// Setup mocks.
- doReturn("/data/misc/gcov/some/path/to/coverage.gcda\n")
+ doReturn("/data/misc/trace/some/path/to/coverage.gcda\n")
.when(mMockDevice)
.executeShellCommand(anyString());
doReturn(false).when(mMockDevice).pullFile(anyString(), any());