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

Commit 272b614b authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-20ee908efc0c492080ac3c73cc1829bb" 

* changes:
  Merge "Migrate Test Mapping" into udc-dev am: 386704d1 am: 73d5f0c8
  Merge "Migrate Test mapping" into udc-dev am: 92fbfb20 am: 8eb1a8cc
  Merge "Migrate Test mapping" into udc-dev am: cd1a8f90 am: ae0538d3
  Merge "Migrate Test Mapping" into udc-dev am: ee3c9ef1 am: 201e61f1
  Merge "Migrate Test mapping" into udc-dev am: 15780e67 am: addb8c11
  Merge "Migrate Test mapping" into udc-dev am: c141f6af am: d03ab4c0
parents 06edceb1 fcc99058

core/java/android/content/pm/TEST_MAPPING

+140 −193
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ 
    "presubmit":[

        {

            "name":"CtsInstantAppTests",

      "file_patterns": ["(/|^)InstantApp[^/]*"]

            "file_patterns":[

                "(/|^)InstantApp[^/]*"

            ]

        },

        {

            "name":"CarrierAppIntegrationTestCases"
@@ -56,7 +58,9 @@ 
        },

        {

            "name":"CtsAppFgsTestCases",

      "file_patterns": ["(/|^)ServiceInfo[^/]*"],

            "file_patterns":[

                "(/|^)ServiceInfo[^/]*"

            ],

            "options":[

                {

                    "include-annotation":"android.platform.test.annotations.Presubmit"
@@ -71,7 +75,9 @@ 
        },

        {

            "name":"CtsShortFgsTestCases",

      "file_patterns": ["(/|^)ServiceInfo[^/]*"],

            "file_patterns":[

                "(/|^)ServiceInfo[^/]*"

            ],

            "options":[

                {

                    "include-annotation":"android.platform.test.annotations.Presubmit"
@@ -160,64 +166,5 @@ 
        {

            "name":"CtsInstallHostTestCases"

        }

  ],

  "staged-platinum-postsubmit": [

    {

      "name": "CtsIncrementalInstallHostTestCases"

    },

    {

      "name": "CtsAppSecurityHostTestCases",

      "options": [

        {

          "include-filter": "android.appsecurity.cts.SplitTests"

        },

        {

          "include-filter": "android.appsecurity.cts.EphemeralTest"

        }

      ]

    },

    {

      "name": "CtsContentTestCases",

      "options": [

        {

          "include-filter": "android.content.cts.IntentFilterTest"

        }

      ]

    }

  ],

  "platinum-postsubmit": [

      {

        "name": "CtsIncrementalInstallHostTestCases",

        "options": [

            {

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

            }

        ]

      },

      {

        "name": "CtsAppSecurityHostTestCases",

        "options": [

            {

                "include-filter": "android.appsecurity.cts.SplitTests"

            },

            {

                "include-filter": "android.appsecurity.cts.EphemeralTest"

            },

            {

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

            }

        ]

      },

      {

        "name": "CtsContentTestCases",

        "options":[

            {

                "include-filter": "android.content.cts.IntentFilterTest"

            },

            {

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

            }

        ]

      }

    ]

}
 
 No newline at end of file

core/tests/coretests/src/android/content/res/TEST_MAPPING

+0 −13
Original line number Diff line number Diff line
@@ -39,18 +39,5 @@ 
        }

      ]

    }

  ],

  "ironwood-postsubmit": [

    {

      "name": "FrameworksCoreTests",

      "options":[

        {

            "include-annotation": "android.platform.test.annotations.IwTest"

        },

        {

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

        }

      ]

    }

  ]

}

libs/WindowManager/Shell/src/com/android/wm/shell/TEST_MAPPING

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
{

  "ironwood-postsubmit": [

    {

      "name": "WMShellFlickerTests",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.IwTest"

        },

        {

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

        }

      ]

    }

  ]

}

packages/SystemUI/TEST_MAPPING

+0 −57
Original line number Diff line number Diff line
@@ -90,63 +90,6 @@ 
  //

  // If you don't use @Postsubmit, your new test will immediately

  // block presubmit, which is probably not what you want!

  "sysui-platinum-postsubmit": [

    {

      "name": "PlatformScenarioTests",

      "options": [

        {

            "include-filter": "android.platform.test.scenario.sysui"

        },

        {

            "include-annotation": "android.platform.test.scenario.annotation.Scenario"

        },

        {

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

        },

        {

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

        },

        {

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        }

      ]

    }

  ],

  "sysui-staged-platinum-postsubmit": [

    {

      "name": "PlatformScenarioTests",

      "options": [

        {

            "include-filter": "android.platform.test.scenario.sysui"

        },

        {

            "include-annotation": "android.platform.test.scenario.annotation.Scenario"

        },

        {

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

        }

      ]

    }

  ],

  "ironwood-postsubmit": [

    {

      "name": "PlatformScenarioTests",

      "options": [

        {

            "include-annotation": "android.platform.test.annotations.IwTest"

        },

        {

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

        },

        {

            "include-filter": "android.platform.test.scenario.sysui"

        },

        {

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        }

      ]

    }

  ],

  "auto-end-to-end-postsubmit": [

    {

      "name": "AndroidAutomotiveHomeTests",

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

+1 −20
Original line number Diff line number Diff line
@@ -6,24 +6,5 @@ 
        {

            "name": "CtsBiometricsHostTestCases"

        }

    ],

    "ironwood-postsubmit": [

     {

      "name": "BiometricsE2eTests",

      "options": [

        {

            "include-annotation": "android.platform.test.annotations.IwTest"

        },

        {

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

        },

        {

            "include-filter": "android.platform.test.scenario.biometrics"

        },

        {

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        }

      ]

    }

    ]

}