Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c9aefbd authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Pull traced files from device for easier debugging 

Will help debug failing tests if we can easily access the traces from the failing tests

Flag: TEST_ONLY

Test: atest InternalTests:com.android.internal.protolog.PerfettoProtoLogImplTest
Change-Id: I86486033cf26a4360d0094c4511f6e3c05956960
parent d0ae1060

tests/Internal/AndroidTest.xml

+8 −0
Original line number Diff line number Diff line
@@ -26,4 +26,12 @@ 
        <option name="package" value="com.android.internal.tests" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

    </test>



    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

        <option name="pull-pattern-keys" value="perfetto_file_path"/>

        <option name="directory-keys"

            value="/data/user/0/com.android.internal.tests/files"/>

        <option name="collect-on-run-ended-only" value="true"/>

        <option name="clean-up" value="true"/>

    </metrics_collector>

</configuration>
 
 No newline at end of file

tests/Internal/src/com/android/internal/protolog/PerfettoProtoLogImplTest.java

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import static java.io.File.createTempFile;

import static java.nio.file.Files.createTempDirectory;



import android.content.Context;

import android.os.SystemClock;
@@ -45,6 +44,7 @@ import android.tracing.perfetto.DataSource; 
import android.util.proto.ProtoInputStream;



import androidx.test.filters.SmallTest;

import androidx.test.platform.app.InstrumentationRegistry;



import com.android.internal.protolog.common.IProtoLogGroup;

import com.android.internal.protolog.common.LogDataType;
@@ -77,7 +77,8 @@ import java.util.concurrent.atomic.AtomicInteger; 
@Presubmit

@RunWith(JUnit4.class)

public class PerfettoProtoLogImplTest {

    private final File mTracingDirectory = createTempDirectory("temp").toFile();

    private final File mTracingDirectory = InstrumentationRegistry.getInstrumentation()

            .getTargetContext().getFilesDir();



    private final ResultWriter mWriter = new ResultWriter()

            .forScenario(new ScenarioBuilder()