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

Commit dd9121aa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: I23f8aac37dde7a9390d8ff478122b13eb99275a2
parents 9fba6ff0 a9a177e0

core/java/android/app/TEST_MAPPING

+12 −10
Original line number Diff line number Diff line
@@ -115,8 +115,11 @@ 
            "file_patterns": ["(/|^)VoiceInteract[^/]*"]

        },

        {

            "name": "CtsContentTestCases",

            "name": "CtsOsTestCases",

            "options": [

                {

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

                },

                {

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

                },
@@ -124,17 +127,14 @@ 
                    "exclude-annotation": "org.junit.Ignore"

                },

                {

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

                    "include-filter": "android.os.cts.StrictModeTest"

                }

            ],

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

        },

        {

            "name": "CtsOsTestCases",

            "name": "FrameworksCoreTests",

            "options": [

                {

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

                },

                {

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

                },
@@ -142,13 +142,15 @@ 
                    "exclude-annotation": "org.junit.Ignore"

                },

                {

                    "include-filter": "android.os.cts.StrictModeTest"

                    "include-filter": "android.content.ContextTest"

                }

            ],

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

        },

        }

    ],

    "presubmit-large": [

        {

            "name": "FrameworksCoreTests",

            "name": "CtsContentTestCases",

            "options": [

                {

                    "exclude-annotation": "androidx.test.filters.FlakyTest"
@@ -157,7 +159,7 @@ 
                    "exclude-annotation": "org.junit.Ignore"

                },

                {

                    "include-filter": "android.content.ContextTest"

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

                }

            ],

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

core/java/android/content/TEST_MAPPING

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

  "presubmit": [

    {

      "name": "CtsContentTestCases",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ],

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

    },

    {

      "name": "CtsOsTestCases",

      "options": [
@@ -51,5 +36,22 @@ 
      ],

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

    }

  ],

  "presubmit-large": [

    {

      "name": "CtsContentTestCases",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ],

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

    }

  ]

}
 
 No newline at end of file

core/java/android/content/om/TEST_MAPPING

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 
          "include-filter": "android.appsecurity.cts.OverlayHostTest"

        }

      ]

    },

    }

  ],

  "presubmit-large": [

    {

      "name": "CtsContentTestCases",

      "options": [

core/java/android/content/pm/TEST_MAPPING

+10 −8
Original line number Diff line number Diff line
@@ -18,6 +18,16 @@ 
    {

      "name": "CarrierAppIntegrationTestCases"

    },

    {

      "name": "CtsIncrementalInstallHostTestCases",

      "options": [

        {

          "include-filter": "android.incrementalinstall.cts.IncrementalFeatureTest"

        }

      ]

    }

  ],

  "presubmit-large": [

    {

      "name": "CtsContentTestCases",

      "options": [
@@ -31,14 +41,6 @@ 
          "include-filter": "android.content.pm.cts"

        }

      ]

    },

    {

      "name": "CtsIncrementalInstallHostTestCases",

      "options": [

        {

          "include-filter": "android.incrementalinstall.cts.IncrementalFeatureTest"

        }

      ]

    }

  ],

  "postsubmit": [

core/java/android/content/res/TEST_MAPPING

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ 
  "presubmit": [

    {

      "name": "CtsResourcesLoaderTests"

    },

    }

  ],

  "presubmit-large": [

    {

      "name": "CtsContentTestCases",

      "options": [