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

Commit ea031114 authored by Ronald Braunstein's avatar Ronald Braunstein Committed by Automerger Merge Worker
Browse files

Merge "Batch creation of test_module_config entries in frameworks/base" into... 

Merge "Batch creation of test_module_config entries in frameworks/base" into main am: 2e1a903f am: a62826e6

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



Change-Id: I4bab2927281efc018de8af42e913fea71c48ded7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc9ee0a7 a62826e6

core/tests/bugreports/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -43,3 +43,10 @@ filegroup { 
    name: "bugreport_artifacts",

    srcs: ["config/test-sysconfig.xml"],

}



test_module_config {

    name: "BugreportManagerTestCases_android_server_os",

    base: "BugreportManagerTestCases",

    test_suites: ["general-tests"],

    exclude_annotations: ["androidx.test.filters.LargeTest"],

}

core/tests/coretests/Android.bp

+65 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ test_module_config { 
    name: "FrameworksCoreTests_Presubmit",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -313,6 +314,7 @@ test_module_config { 
    name: "FrameworksCoreTests_inputmethod",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -327,6 +329,7 @@ test_module_config { 
    name: "FrameworksCoreTests_context",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -337,6 +340,7 @@ test_module_config { 
    name: "FrameworksCoreTests_keyguard_manager",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -347,6 +351,7 @@ test_module_config { 
    name: "FrameworksCoreTests_property_invalidated_cache",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -357,6 +362,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_content",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -371,6 +377,7 @@ test_module_config { 
    name: "FrameworksCoreTests_sqlite",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -381,6 +388,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_net",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -392,6 +400,7 @@ test_module_config { 
    name: "FrameworksCoreTests_battery_stats",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -403,6 +412,7 @@ test_module_config { 
    name: "FrameworksCoreTests_environment",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -413,6 +423,7 @@ test_module_config { 
    name: "FrameworksCoreTests_util_data_charset",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -426,6 +437,7 @@ test_module_config { 
    name: "FrameworksCoreTests_xml",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -439,6 +451,7 @@ test_module_config { 
    name: "FrameworksCoreTests_util_apk",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -449,6 +462,7 @@ test_module_config { 
    name: "FrameworksCoreTests_textclassifier",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -460,6 +474,7 @@ test_module_config { 
    name: "FrameworksCoreTests_internal_app",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -474,6 +489,7 @@ test_module_config { 
    name: "FrameworksCoreTests_internal_content",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -484,6 +500,7 @@ test_module_config { 
    name: "FrameworksCoreTests_internal_infra",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -494,6 +511,7 @@ test_module_config { 
    name: "FrameworksCoreTests_internal_jank",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -504,6 +522,7 @@ test_module_config { 
    name: "FrameworksCoreTests_internal_os_binder",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -515,6 +534,7 @@ test_module_config { 
    name: "FrameworksCoreTests_internal_os_kernel",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -531,6 +551,7 @@ test_module_config { 
    name: "FrameworksCoreTests_server_power",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -541,6 +562,7 @@ test_module_config { 
    name: "FrameworksCoreTests_internal_security",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -552,6 +574,7 @@ test_module_config { 
    name: "FrameworksCoreTests_internal_util_latency_tracker",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -562,6 +585,7 @@ test_module_config { 
    name: "FrameworksCoreTests_content_capture_options",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -572,6 +596,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_content_integrity",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -582,6 +607,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_content_pm_PreSubmit",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -593,6 +619,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_content_pm_PostSubmit",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -604,6 +631,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_content_res",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -620,6 +648,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_content_res_PostSubmit",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -631,6 +660,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_service",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -650,6 +680,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_view_contentcapture",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -660,6 +691,7 @@ test_module_config { 
    name: "FrameworksCoreTests_android_view_contentprotection",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -670,6 +702,7 @@ test_module_config { 
    name: "FrameworksCoreTests_com_android_internal_content_Presubmit",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -681,6 +714,7 @@ test_module_config { 
    name: "FrameworksCoreTests_drawable",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -691,6 +725,7 @@ test_module_config { 
    name: "FrameworksCoreTests_accessibility",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -705,6 +740,7 @@ test_module_config { 
    name: "FrameworksCoreTests_usage",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -715,6 +751,7 @@ test_module_config { 
    name: "FrameworksCoreTests_fastdata",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -725,6 +762,7 @@ test_module_config { 
    name: "FrameworksCoreTests_hardware_input",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -735,6 +773,7 @@ test_module_config { 
    name: "FrameworksCoreTests_view_verified",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -744,10 +783,35 @@ test_module_config { 
    ],

}



test_module_config {

    name: "FrameworksCoreTests_android_net_Presubmit",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-platinum-tests",

        "device-tests",

    ],

    include_filters: ["android.net"],

    include_annotations: ["android.platform.test.annotations.Presubmit"],

}



test_module_config {

    name: "FrameworksCoreTests_content_pm_Postsubmit",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-platinum-tests",

        "device-tests",

    ],

    include_filters: ["android.content.pm."],

    include_annotations: ["android.platform.test.annotations.Postsubmit"],

}



test_module_config {

    name: "FrameworksCoreTests_jank",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],
@@ -762,6 +826,7 @@ test_module_config { 
    name: "FrameworksCoreTests_Platinum",

    base: "FrameworksCoreTests",

    test_suites: [

        "automotive-tests",

        "device-tests",

        "device-platinum-tests",

    ],

libs/WindowManager/Jetpack/tests/unittest/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -62,3 +62,10 @@ android_test { 
        enabled: false,

    },

}



test_module_config {

    name: "WMJetpackUnitTests_Presubmit",

    base: "WMJetpackUnitTests",

    test_suites: ["device-tests"],

    include_annotations: ["android.platform.test.annotations.Presubmit"],

}

media/tests/LoudnessCodecApiTest/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -25,3 +25,10 @@ android_test { 
    resource_dirs: ["res"],

    test_suites: ["device-tests"],

}



test_module_config {

    name: "LoudnessCodecApiTest_Presubmit",

    base: "LoudnessCodecApiTest",

    test_suites: ["device-tests"],

    include_annotations: ["android.platform.test.annotations.Presubmit"],

}

packages/Shell/tests/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -26,3 +26,10 @@ android_test { 
    instrumentation_for: "Shell",

    certificate: "platform",

}



test_module_config {

    name: "ShellTests_android_server_os",

    base: "ShellTests",

    test_suites: ["device-tests"],

    exclude_annotations: ["androidx.test.filters.LargeTest"],

}