summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2023-08-29 07:23:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-29 07:23:36 +0000
commit2d68ef25ec037f668d994369faf40eaaef03ebff (patch)
treedb497a19eaf516ded214e2847a172e28ffe8de31
parent914ad29f61be2c2b607e61b89598decec65a5cae (diff)
parent942d47b019852409865ee53a189b09cc0743dff1 (diff)
Merge "Add TEST_MAPPING for VPN related files" into main am: 942d47b019
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2727897 Change-Id: I12bf8f9f8783a5ac09176278b9fd73bb5597d834 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/connectivity/TEST_MAPPING30
1 files changed, 30 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/connectivity/TEST_MAPPING b/services/core/java/com/android/server/connectivity/TEST_MAPPING
new file mode 100644
index 000000000000..687d4b06b4c0
--- /dev/null
+++ b/services/core/java/com/android/server/connectivity/TEST_MAPPING
@@ -0,0 +1,30 @@
+{
+ "presubmit": [
+ {
+ "name": "FrameworksNetTests",
+ "options": [
+ {
+ "exclude-annotation": "com.android.testutils.SkipPresubmit"
+ }
+ ],
+ "file_patterns": ["Vpn\\.java", "VpnIkeV2Utils\\.java", "VpnProfileStore\\.java"]
+ }
+ ],
+ "presubmit-large": [
+ {
+ "name": "CtsHostsideNetworkTests",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ },
+ {
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ },
+ {
+ "exclude-annotation": "com.android.testutils.SkipPresubmit"
+ }
+ ],
+ "file_patterns": ["Vpn\\.java", "VpnIkeV2Utils\\.java", "VpnProfileStore\\.java"]
+ }
+ ]
+} \ No newline at end of file