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

Commit e7f900f0 authored by Ronald Braunstein's avatar Ronald Braunstein Committed by Gerrit Code Review
Browse files

Merge "Migrate FrameworksServicesTests options to Android.bp" into main

parents 5cdb2b51 21b0b3bc

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

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

        },

        {

            "name": "FrameworksServicesTests",

            "options": [

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

                {"exclude-annotation": "androidx.test.filters.FlakyTest"},

                {"exclude-annotation": "androidx.test.filters.LargeTest"}

            ]

            "name": "FrameworksServicesTests_com_android_server_job_Presubmit"

        }

    ],

    "postsubmit": [

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

+1 −5
Original line number Diff line number Diff line
@@ -17,11 +17,7 @@ 
      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

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

        {"exclude-annotation": "androidx.test.filters.FlakyTest"}

      ]

      "name": "FrameworksServicesTests_com_android_server_usage_Presubmit"

    }

  ],

  "postsubmit": [

core/java/android/app/TEST_MAPPING

+1 −6
Original line number Diff line number Diff line
@@ -29,12 +29,7 @@ 
        },

        {

            "file_patterns": ["(/|^)AppOpsManager.java"],

            "name": "FrameworksServicesTests",

            "options": [

                {

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

                }

            ]

            "name": "FrameworksServicesTests_android_server_appop"

        },

        {

            "file_patterns": ["(/|^)AppOpsManager.java"],

core/java/android/os/TEST_MAPPING

+1 −4
Original line number Diff line number Diff line
@@ -82,10 +82,7 @@ 
        "PowerComponents\\.java",

        "[^/]*BatteryConsumer[^/]*\\.java"

      ],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" }

      ]

      "name": "FrameworksServicesTests_battery_stats"

    },

    {

      "file_patterns": [

core/java/com/android/internal/os/TEST_MAPPING

+1 −4
Original line number Diff line number Diff line
@@ -28,10 +28,7 @@ 
        "Kernel[^/]*\\.java",

        "[^/]*Power[^/]*\\.java"

      ],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" }

      ]

      "name": "FrameworksServicesTests_battery_stats"

    },

    {

      "file_patterns": [