Merge "Add DeviceTypeRule to filter tests only for large screens or foldable" into tm-dev am: 18badb64b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17695054 Change-Id: I65732a4d4470e98890f4a7ac4ed75c55efe7cc63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -16,12 +16,6 @@
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "android.platform.test.annotations.Postsubmit"
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "android.platform.test.scenario.annotation.LargeScreenOnly"
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "android.platform.test.scenario.annotation.FoldableOnly"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -93,12 +87,6 @@
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "androidx.test.filters.FlakyTest"
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "android.platform.test.scenario.annotation.LargeScreenOnly"
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "android.platform.test.scenario.annotation.FoldableOnly"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -115,12 +103,6 @@
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "org.junit.Ignore"
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "android.platform.test.scenario.annotation.LargeScreenOnly"
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "android.platform.test.scenario.annotation.FoldableOnly"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -143,25 +125,6 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"large-screen-postsubmit": [
|
||||
{
|
||||
"name": "PlatformScenarioTests",
|
||||
"options" : [
|
||||
{
|
||||
"include-filter": "android.platform.test.scenario.sysui"
|
||||
},
|
||||
{
|
||||
"include-annotation": "android.platform.test.scenario.annotation.LargeScreenOnly"
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "org.junit.Ignore"
|
||||
},
|
||||
{
|
||||
"exclude-annotation": "androidx.test.filters.FlakyTest"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"hubui-postsubmit": [
|
||||
{
|
||||
"name": "PlatformScenarioTests",
|
||||
|
||||
Reference in New Issue
Block a user