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

Commit d2d82724 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Add FrameworksInProcessTests to presubmit." into sc-dev am: 015c5af3 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bdccaf81f03fdcd7e283d007c635f2d664f5789
parents 2b75b9df 015c5af3

TEST_MAPPING

+11 −0
Original line number Diff line number Diff line
@@ -51,6 +51,17 @@ 
          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    },

    {

      "name": "FrameworksInProcessTests",

      "options": [

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "postsubmit-managedprofile-stress": [

services/tests/inprocesstests/AndroidTest.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
    </target_preparer>



    <!-- Restart to clear test code from system server -->

    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="teardown-command" value="am restart" />

    <target_preparer class="com.android.tradefed.targetprep.DeviceCleaner">

        <option name="cleanup-action" value="REBOOT" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest">