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

Commit 7172238a authored by Jackal Guo's avatar Jackal Guo Committed by Felka Chang
Browse files

Move CtsContentTestCases to group presubmit-large 

The test config takes longer than 900 seconds to run. Move it to a
dedicated group for running slow presubmit Test Mapping test.

Some more context is in the referenced bug, e.g, b/174495337
The group will work exactly the same as presubmit for now.

Bug: 174654670
Bug: 174495337
Fix: 215431363
Fix: 215549069
Test: treehugger
Change-Id: Id9769bbc625b42257af603d69098ae69c0fabb80
Merged-In: Id9769bbc625b42257af603d69098ae69c0fabb80
(cherry picked from commit ccc91c4f)
parent 6dcb9e28

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": [