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

Commit 2c719f45 authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Move ProtoLog tests to seperate test directory dedicated to tracing...

Merge "Move ProtoLog tests to seperate test directory dedicated to tracing tests" into main am: 300ec631

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3290108



Change-Id: I66ea65a397231ccdff5569db313b8cc88e23250b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4bb1ff08 300ec631
Loading
Loading
Loading
Loading
+33 −0
Original line number Diff line number Diff line
package {
    // See: http://go/android-license-faq
    // A large-scale-change added 'default_applicable_licenses' to import
    // all of the 'license_kinds' from "frameworks_base_license"
    // to get the below license kinds:
    //   SPDX-license-identifier-Apache-2.0
    default_team: "trendy_team_windowing_tools",
    default_applicable_licenses: ["frameworks_base_license"],
}

android_test {
    name: "TracingTests",
    proto: {
        type: "nano",
    },
    // Include some source files directly to be able to access package members
    srcs: ["src/**/*.java"],
    libs: ["android.test.runner.impl"],
    static_libs: [
        "junit",
        "androidx.test.rules",
        "mockito-target-minus-junit4",
        "truth",
        "platform-test-annotations",
        "flickerlib-parsers",
        "perfetto_trace_java_protos",
        "flickerlib-trace_processor_shell",
    ],
    java_resource_dirs: ["res"],
    certificate: "platform",
    platform_apis: true,
    test_suites: ["device-tests"],
}
+33 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2017 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.tracing.tests">
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.BIND_WALLPAPER"/>
    <!-- Allow the test to connect to perfetto trace processor -->
    <uses-permission android:name="android.permission.INTERNET"/>
    <application
        android:requestLegacyExternalStorage="true"
        android:networkSecurityConfig="@xml/network_security_config">
        <uses-library android:name="android.test.runner"/>
    </application>

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.tracing.tests"
         android:label="Tracing Tests"/>
</manifest>
+40 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2017 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
<configuration description="Runs tests for tracing classes/utilities.">
    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
        <option name="test-file-name" value="TracingTests.apk" />
    </target_preparer>

    <!-- Needed for pushing the trace config file -->
    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

    <option name="test-suite-tag" value="apct" />
    <option name="test-suite-tag" value="framework-base-presubmit" />
    <option name="test-tag" value="TracingTests" />
    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
        <option name="package" value="com.android.tracing.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.tracing.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
+1 −1
Original line number Diff line number Diff line
# ProtoLog owners
# Tracing owners
# Bug component: 1157642
include platform/development:/tools/winscope/OWNERS
+7 −0
Original line number Diff line number Diff line
{
  "postsubmit": [
    {
      "name": "TracingTests"
    }
  ]
}
 No newline at end of file
Loading