summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2021-10-20 10:42:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-20 10:42:55 +0000
commitdbac4fe08671cc171de542a37ff5bc58055ce852 (patch)
treec6cff9b75a859d650e02af6023941bfcc975a5cc /core/java
parent29ac6eb09ebc6972fef4e8b525554979adebbc54 (diff)
parent7a2ea90d147e88ab3d872dc93e0841ea02380c19 (diff)
Merge "Add android.net tests to postsubmit" am: 5b274f5eef am: 8bbc86d1e2 am: 50d27878ea am: 7a2ea90d14
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863053 Change-Id: Iac340ae322f29dfbef13b2854619b87f282b1fd0
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/TEST_MAPPING19
1 files changed, 19 insertions, 0 deletions
diff --git a/core/java/android/net/TEST_MAPPING b/core/java/android/net/TEST_MAPPING
index 8c13ef98bedb..a379c33316f0 100644
--- a/core/java/android/net/TEST_MAPPING
+++ b/core/java/android/net/TEST_MAPPING
@@ -16,5 +16,24 @@
{
"path": "frameworks/opt/net/wifi"
}
+ ],
+ "postsubmit": [
+ {
+ "name": "FrameworksCoreTests",
+ "options": [
+ {
+ "include-filter": "android.net"
+ },
+ {
+ "include-annotation": "android.platform.test.annotations.Presubmit"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ },
+ {
+ "exclude-annotation": "org.junit.Ignore"
+ }
+ ]
+ }
]
}