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

Commit 41412f3a authored by Xiang Wang's avatar Xiang Wang
Browse files

Revert^2 "Update test mapping for all headroom tests" 

This reverts commit d4fd3235.

Reason for revert: reland

Change-Id: I4e185f6ef1afd874273d1aea1240b3ae3fb79638
parent d4fd3235

core/java/android/os/TEST_MAPPING

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

      "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

+15 −3
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 
    {

       "name": "CtsOsTestCases_cts_performancehintmanagertest",

       "file_patterns": ["performance_hint.cpp"]

    }

  ],

  "postsubmit": [

    },

    {

      "name": "CtsThermalTestCases",

       "file_patterns": ["thermal.cpp"]
@@ -27,5 +25,19 @@ 
      "name": "NativeThermalUnitTestCases",

       "file_patterns": ["thermal.cpp"]

    }

  ],

  "postsubmit": [

    {

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

       "name": "NativeSystemHealthUnitTestCases"

    },

    {

      "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

+17 −0
Original line number Diff line number Diff line
@@ -15,5 +15,22 @@ 
        {"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