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

Commit 347ab194 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Honor org.junit.Ignore annotation." into rvc-dev am: 5855ce58 am:...

Merge "Honor org.junit.Ignore annotation." into rvc-dev am: 5855ce58 am: 1ebd52db am: 7983a8bc

Change-Id: I48792f2270562df5690c244f114ee7346ed50d1b
parents b49bb9ba 7983a8bc
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@
        {
            "include-annotation": "android.platform.test.scenario.annotation.Scenario"
        },
        {
            "exclude-annotation": "org.junit.Ignore"
        },
        {
            "exclude-annotation": "androidx.test.filters.FlakyTest"
        }
@@ -27,6 +30,9 @@
        {
            "include-annotation": "android.platform.test.scenario.annotation.Scenario"
        },
        {
            "exclude-annotation": "org.junit.Ignore"
        },
        {
            "exclude-annotation": "androidx.test.filters.FlakyTest"
        },