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

Commit 4e593f7f authored by Dieter Hsu's avatar Dieter Hsu Committed by Android (Google) Code Review
Browse files

Merge "Enable bug report tests in pre/postsubmit"

parents 52dff80c 848113e5

core/java/android/os/TEST_MAPPING

0 → 100644
+40 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    // TODO(159590499) add BugreportManagerTestCases

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "CtsBugreportTestCases",

      "options": [

        {

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

        }

      ]

    },

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "ShellTests",

      "options": [

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "BugreportManagerTestCases"

    },

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "CtsBugreportTestCases"

    },

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "ShellTests"

    }

  ]

}

packages/Shell/TEST_MAPPING

0 → 100644
+31 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "CtsBugreportTestCases",

      "options": [

        {

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

        }

      ]

    },

    {

      "name": "ShellTests",

      "options": [

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "CtsBugreportTestCases"

    },

    {

      "name": "ShellTests"

    }

  ]

}

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

+36 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    // TODO(159590499) add BugreportManagerTestCases

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "CtsBugreportTestCases",

      "options": [

        {

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

        }

      ]

    },

    {

      "name": "CtsUsbTests"

    },

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "ShellTests",

      "options": [

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "BugreportManagerTestCases"

    },

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "CtsBugreportTestCases"

    },

    {

      "file_patterns": ["Bugreport[^/]*\\.java"],

      "name": "ShellTests"

    }

  ]

}