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

Commit 0edd8471 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge changes I85926323,Ia4ab69c8 into main 

* changes:
  Move Time servicestests to their own test module
  Move Time coretests to their own test module
parents 9481b2b3 8ea631ac

core/java/android/app/time/TEST_MAPPING

+2 −15
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksCoreTests",

      "options": [

        {

          "include-filter": "android.app.time."

        }

      ]

    }

  ],

  // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.

  "postsubmit": [

    {

      "name": "FrameworksCoreTests",

      "name": "FrameworksTimeCoreTests",

      "options": [

        {

          "include-filter": "android.app.timedetector."

        },

        {

          "include-filter": "android.app.timezonedetector."

          "include-filter": "android.app."

        }

      ]

    },

core/java/android/app/timedetector/TEST_MAPPING

+2 −5
Original line number Diff line number Diff line
@@ -2,13 +2,10 @@ 
  // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.

  "postsubmit": [

    {

      "name": "FrameworksCoreTests",

      "name": "FrameworksTimeCoreTests",

      "options": [

        {

          "include-filter": "android.app.time."

        },

        {

          "include-filter": "android.app.timedetector."

          "include-filter": "android.app."

        }

      ]

    },

core/java/android/app/timezonedetector/TEST_MAPPING

+2 −12
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksCoreTests",

      "options": [

        {

          "include-filter": "android.app.timezonedetector."

        }

      ]

    }

  ],

  // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.

  "postsubmit": [

    {

      "name": "FrameworksCoreTests",

      "name": "FrameworksTimeCoreTests",

      "options": [

        {

          "include-filter": "android.app.time."

          "include-filter": "android.app."

        }

      ]

    },

core/java/android/service/timezone/TEST_MAPPING

+2 −2
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
  // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.

  "postsubmit": [

    {

      "name": "FrameworksCoreTests",

      "name": "FrameworksTimeCoreTests",

      "options": [

        {

          "include-filter": "android.service.timezone."

          "include-filter": "android.service."

        }

      ]

    },

core/tests/coretests/src/android/app/timedetector/OWNERS

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
# Bug component: 847766

include /core/java/android/app/timedetector/OWNERS