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

Commit e79eeea7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate more of FrameworksServicesTests to use options from Android.bp"... 

Merge "Migrate more of FrameworksServicesTests to use options from Android.bp" into main am: f824197c am: 5a942c3d

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



Change-Id: I9d7b5e32f2f4cfcba803590eb2581cfe2b081d62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aec613b5 5a942c3d

apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING

+1 −4
Original line number Diff line number Diff line
@@ -25,10 +25,7 @@ 
            ]

        },

        {

            "name": "FrameworksServicesTests",

            "options": [

                {"include-filter": "com.android.server.job"}

            ]

            "name": "FrameworksServicesTests_com_android_server_job"

        },

        {

            "name": "CtsHostsideNetworkPolicyTests",

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

+1 −4
Original line number Diff line number Diff line
@@ -21,10 +21,7 @@ 
      "name": "CtsUsageStatsTestCases"

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

        {"include-filter": "com.android.server.usage"}

      ]

      "name": "FrameworksServicesTests_com_android_server_usage"

    }

  ]

}

services/core/java/com/android/server/TEST_MAPPING

+3 −24
Original line number Diff line number Diff line
@@ -78,24 +78,11 @@ 
            "file_patterns": ["StorageManagerService\\.java"]

        },

        {

            "name": "FrameworksServicesTests",

            "options": [

                {

                    "include-filter": "com.android.server.BinaryTransparencyServiceTest"

                }

            ],

            "name": "FrameworksServicesTests_binary_transparency",

            "file_patterns": ["BinaryTransparencyService\\.java"]

        },

        {

            "name": "FrameworksServicesTests",

            "options": [

                {

                    "include-filter": "com.android.server.PinnerServiceTest"

                },

                {

                    "exclude-annotation": "org.junit.Ignore"

                }

            ],

            "name": "FrameworksServicesTests_pinner_service",

            "file_patterns": ["PinnerService\\.java"]

        },

        {
@@ -176,15 +163,7 @@ 
            "name": "CtsPackageManagerTestCases"

        },

        {

            "name": "FrameworksServicesTests",

            "options": [

                {

                    "include-filter": "com.android.server.PinnerServiceTest"

                },

                {

                    "exclude-annotation": "org.junit.Ignore"

                }

            ],

            "name": "FrameworksServicesTests_pinner_service",

            "file_patterns": ["PinnerService\\.java"]

        },

        {

services/core/java/com/android/server/am/TEST_MAPPING

+1 −6
Original line number Diff line number Diff line
@@ -94,12 +94,7 @@ 
  ],

  "postsubmit": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

          "include-filter": "com.android.server.am."

        }

      ]

      "name": "FrameworksServicesTests_android_server_am"

    },

    {

      "name": "CtsAppDataIsolationHostTestCases"

services/core/java/com/android/server/hdmi/TEST_MAPPING

+1 −9
Original line number Diff line number Diff line
@@ -6,15 +6,7 @@ 
  ],

  "postsubmit": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

          "include-filter": "com.android.server.hdmi"

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

      "name": "FrameworksServicesTests_android_server_hdmi"

    }

  ],

  // Postsubmit tests for TV devices