summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-31 16:27:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-31 16:27:45 +0000
commitc01a08c3d45c270da92ef78ba60787d29e988650 (patch)
tree929e5af1ee2720dcc929e4406ccc3df9af0dbd60
parentf4eb2201ae66668b00043bafc0d021355ce620eb (diff)
parent85e73e6099f2fc3a1ed64e0d9ddb521ba39cf76c (diff)
Merge "Add tests to services/tests/net test mapping" am: 85e73e6099
Change-Id: Id503a2daac1a508095b388aa8524342141571d6e
-rw-r--r--tests/net/TEST_MAPPING7
-rw-r--r--tests/net/deflake/Android.bp3
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/net/TEST_MAPPING b/tests/net/TEST_MAPPING
index a7853b68c1c1..005cbe9ffdc4 100644
--- a/tests/net/TEST_MAPPING
+++ b/tests/net/TEST_MAPPING
@@ -1,7 +1,12 @@
{
- "postsubmit": [
+ "presubmit": [
{
"name": "FrameworksNetIntegrationTests"
}
+ ],
+ "postsubmit": [
+ {
+ "name": "FrameworksNetDeflakeTest"
+ }
]
} \ No newline at end of file
diff --git a/tests/net/deflake/Android.bp b/tests/net/deflake/Android.bp
index 1c48c749aacc..b1b017131c64 100644
--- a/tests/net/deflake/Android.bp
+++ b/tests/net/deflake/Android.bp
@@ -26,4 +26,5 @@ java_test_host {
"net-host-tests-utils",
],
data: [":FrameworksNetTests"],
-} \ No newline at end of file
+ test_suites: ["device-tests"],
+}