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

Commit d4fd3235 authored by Chun-Yi Lee's avatar Chun-Yi Lee Committed by Android (Google) Code Review
Browse files

Revert "Update test mapping for all headroom tests" 

This reverts commit 4b9716c8.

Reason for revert: b/389839447

Change-Id: I1d32be0266fe88c20a63b6acf5f3f0b6fbfae4b6
parent 4b9716c8

core/java/android/os/TEST_MAPPING

+0 −26
Original line number Diff line number Diff line
@@ -112,32 +112,6 @@ 
    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "ShellTests"

    },

    {

      "file_patterns": [

        "CpuHeadroom[^/]*",

        "GpuHeadroom[^/]*",

        "health/SystemHealthManager\\.java"

      ],

      "name": "CtsOsTestCases",

      "options": [

        {"include-filter": "android.os.health.cts.HeadroomTest"},

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

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

      ]

    },

    {

      "file_patterns": [

        "CpuHeadroom[^/]*",

        "GpuHeadroom[^/]*",

        "health/SystemHealthManager\\.java"

      ],

      "name": "FrameworksCoreTests",

      "options": [

        {"include-filter": "android.os.SystemHealthManagerUnitTest"},

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

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

      ]

    }

  ],

  "ravenwood-presubmit": [

native/android/TEST_MAPPING

+0 −16
Original line number Diff line number Diff line
@@ -26,22 +26,6 @@ 
    {

      "name": "NativeThermalUnitTestCases",

       "file_patterns": ["thermal.cpp"]

    },

    {

       "file_patterns": ["system_health.cpp"],

       "name": "NativeSystemHealthUnitTestCases",

       "options": [

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

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

        ]

    },

    {

      "file_patterns": ["system_health.cpp"],

      "name": "CtsSystemHealthTestCases",

      "options": [

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

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

      ]

    }

  ]

}

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

+0 −17
Original line number Diff line number Diff line
@@ -15,22 +15,5 @@ 
        {"exclude-annotation": "org.junit.Ignore"}

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "CtsSystemHealthTestCases",

      "options": [

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

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

      ]

    },

    {

      "name": "CtsOsTestCases",

      "options": [

        {"include-filter": "android.os.health.cts.HeadroomTest"},

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

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

      ]

    }

  ]

}
 
 No newline at end of file