Snap for 6683823 from 46799394c0c5552e040f902a3e1c03c34cd9f970 to rvc-release
Change-Id: Ief84a695380015f23c1bc11c36ac96b91956e08e
diff --git a/Android.bp b/Android.bp
index 7e0197a..db610a6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -240,7 +240,7 @@
cc_test {
name: "resolv_unit_test",
test_suites: [
- "device-tests",
+ "general-tests",
"mts",
],
require_root: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 10533ed..f79e303 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,5 +5,12 @@
{ "name": "resolv_unit_test" },
{ "name": "resolv_stress_test" },
{ "name": "resolv_stats_test_utils_test" }
+ ],
+ "mainline-presubmit": [
+ { "name": "resolv_integration_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
+ { "name": "resolv_gold_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
+ { "name": "resolv_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
+ { "name": "resolv_stress_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" },
+ { "name": "resolv_stats_test_utils_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]" }
]
}
diff --git a/resolv_test_config_template.xml b/resolv_test_config_template.xml
index 3caba2b..9acfe5f 100644
--- a/resolv_test_config_template.xml
+++ b/resolv_test_config_template.xml
@@ -20,6 +20,7 @@
-->
<configuration description="Configuration for {MODULE} tests">
<option name="test-suite-tag" value="mts" />
+ <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
diff --git a/tests/Android.bp b/tests/Android.bp
index 4a258cb..7abdc4e 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -73,7 +73,7 @@
cc_test {
name: "resolv_gold_test",
- test_suites: ["device-tests", "mts"],
+ test_suites: ["general-tests", "mts"],
require_root: true,
// b/151392634, this is a workaround because MTS
// can not handle the test with testdata correctly.
@@ -113,7 +113,7 @@
cc_test {
name: "resolv_stress_test",
- test_suites: ["device-tests", "mts"],
+ test_suites: ["general-tests", "mts"],
// This won't work with test_config
// require_root: true,
// TODO: Remove resolv_test_mts_coverage_defaults after mts coverage switched to 64-bit device.
@@ -142,7 +142,7 @@
cc_test {
name: "resolv_integration_test",
- test_suites: ["device-tests", "mts"],
+ test_suites: ["general-tests", "mts"],
require_root: true,
test_config_template: ":resolv_test_config_template",
defaults: ["netd_defaults", "resolv_test_defaults"],
@@ -213,7 +213,8 @@
"resolv_stats_test_utils_test.cpp",
],
defaults: ["netd_defaults", "resolv_test_defaults"],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
+ test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],
static_libs: [
"libgmock",
"libprotobuf-cpp-lite",
diff --git a/tests/resolv_gold_test_config.xml b/tests/resolv_gold_test_config.xml
index e70a7e6..b814f13 100644
--- a/tests/resolv_gold_test_config.xml
+++ b/tests/resolv_gold_test_config.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Configuration for resolv gold tests">
<option name="test-suite-tag" value="mts" />
+ <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="resolv_gold_test->/data/local/tmp/resolv_gold_test" />
