LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable R+ tests on Q

Browse Source 
Add Sdk30ModuleController to ConnectivityCoverageTests and
connectivity_native_test, as they cover code in the Tethering module,
which is R+.

Test: atest ConnectivityCoverageTests connectivity_native_test
Change-Id: Ida573d4e231bf29989f699a9fef77d3a677425c8
This commit is contained in:
Remi NGUYEN VAN
2022-04-07 16:20:41 +09:00
parent 82ef475266
commit bef435bf9b
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/common/AndroidTest_Coverage.xml
View File

@@ -18,6 +18,8 @@
</target_preparer> </target_preparer>
<option name="test-tag" value="ConnectivityCoverageTests" /> <option name="test-tag" value="ConnectivityCoverageTests" />
<!-- Tethering/Connectivity is a SDK 30+ module -->
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" /> <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" > <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.connectivity.tests.coverage" /> <option name="package" value="com.android.connectivity.tests.coverage" />

3
tests/native/Android.bp
View File

@@ -5,8 +5,8 @@ cc_test {
"mts-tethering", "mts-tethering",
"vts", "vts",
], ],
test_config_template: "AndroidTestTemplate.xml",
min_sdk_version: "31", min_sdk_version: "31",
require_root: true,
tidy: false, tidy: false,
srcs: [ srcs: [
"connectivity_native_test.cpp", "connectivity_native_test.cpp",
@@ -26,5 +26,4 @@ cc_test {
"libutils", "libutils",
], ],
compile_multilib: "first", compile_multilib: "first",
defaults: ["connectivity-mainline-presubmit-cc-defaults"],
} }

30
tests/native/AndroidTestTemplate.xml Normal file
View File

@@ -0,0 +1,30 @@
<!-- Copyright (C) 2022 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configuration description="Configuration for connectivity {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" />
<!-- The tested code is only part of a SDK 30+ module (Tethering) -->
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="{MODULE}" />
</test>
</configuration>