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

Commit 58d28d82 authored by Achim Thesmann's avatar Achim Thesmann Committed by Android (Google) Code Review
Browse files

Merge changes I62c2e5a4,I00c13d3d into main 

* changes:
  Filter tests in postsubmit
  Move tests from postsubmit to presubmit
parents 46d98049 ab0145b4

core/java/android/app/TEST_MAPPING

+8 −8
Original line number Diff line number Diff line
@@ -378,6 +378,14 @@ 
                }

            ],

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

        },

        {

            "file_patterns": [

                "(/|^)Activity.*.java",

                "(/|^)PendingIntent.java",

                "(/|^)ComtextImpl.java"

            ],

            "name": "CtsWindowManagerBackgroundActivityTestCases"

        }

    ],

    "postsubmit": [
@@ -392,14 +400,6 @@ 
        {

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

            "name": "CtsAppOpsTestCases"

        },

        {

            "file_patterns": [

                "(/|^)Activity.*.java",

                "(/|^)PendingIntent.java",

                "(/|^)ComtextImpl.java"

            ],

            "name": "CtsWindowManagerBackgroundActivityTestCases"

        }

    ]

}

core/java/android/content/TEST_MAPPING

+4 −4
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ 
        }

      ],

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

    },

    {

      "name": "CtsWindowManagerBackgroundActivityTestCases",

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

    }

  ],

  "ravenwood-presubmit": [
@@ -65,9 +69,5 @@ 
    }

  ],

  "postsubmit": [

    {

      "name": "CtsWindowManagerBackgroundActivityTestCases",

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

    }

  ]

}

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

+13 −8
Original line number Diff line number Diff line
@@ -134,6 +134,13 @@ 
        },

        {

            "name": "CtsSuspendAppsTestCases"

        },

        {

            "name": "CtsWindowManagerBackgroundActivityTestCases",

            "file_patterns": [

                "Background.*\\.java",

                "Activity.*\\.java"

            ]

        }

    ],

    "presubmit-large": [
@@ -188,18 +195,16 @@ 
        {

            "name": "SelinuxFrameworksTests"

        },

        {

            "name": "CtsWindowManagerBackgroundActivityTestCases",

            "file_patterns": [

                "Background.*\\.java",

                "Activity.*\\.java"

            ]

        },

        {

            "name": "WmTests",

            "file_patterns": [

                "Background.*\\.java",

                "Activity.*\\.java"

            ],

            "options": [

                {

                    "include-filter": "com.android.server.wm.BackgroundActivityStart*"

                }

            ]

        }

   ]